Commit graph

2534 commits

Author SHA1 Message Date
Nate Jensen
553475c0a2 Merge "Issue #2491 Remove ISerializableObject references in core and d2d viz plugins. Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07" into development
Former-commit-id: c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly c1a5165bf9 [formerly 4cd0b3fed7] [formerly ac65672cb2] [formerly f62f7dc851 [formerly ac65672cb2 [formerly a35255318c9e5160f69cb784b86fd7d145465aac]]]]
Former-commit-id: f62f7dc851
Former-commit-id: 7ac7a7ce3d [formerly 9dc4378fc4] [formerly 236fe4b18811523bce5e5090bd5f361fa56869a5 [formerly 87917f3548]]
Former-commit-id: 0e9c2c54cf24b0469949784c3ccb934967d72820 [formerly 98118ccced]
Former-commit-id: b2072949f9
2013-10-28 13:27:17 -05:00
Ben Steffensmeier
d74e82bcc5 Issue #2491 Remove ISerializableObject references in core and d2d viz plugins.
Change-Id: I8c89a49d1291f640ac7032b837300fd7b013de07

Former-commit-id: 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 642e80aadb [formerly 4e86bb8e5f] [formerly 65522e83c9] [formerly 5b439696df [formerly 65522e83c9 [formerly 57825609e668f6595fa8cc6da4ec81a310abf966]]]]
Former-commit-id: 5b439696df
Former-commit-id: 285a0af019 [formerly 54a39977f5] [formerly ae5d9cd5f9d93524f8b356e1b865d0b7966eab25 [formerly 6866344496]]
Former-commit-id: a70f5f2f9ec94543623b1366018f66b21d4873b5 [formerly e3e621660f]
Former-commit-id: c0ba7d0acc
2013-10-28 13:16:23 -05:00
Ron Anderson
b0f0709755 Merge "Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins." into development
Former-commit-id: 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly 283404400d [formerly dd3ef2844c] [formerly fa5b6dce02] [formerly f2cfc0c686 [formerly fa5b6dce02 [formerly c4c1905a1ac16682ad5607b853041905dbde8a5b]]]]
Former-commit-id: f2cfc0c686
Former-commit-id: 306a5d72f4 [formerly 3575496955] [formerly 6d4daeecfebab06573c97b74f855c3bb1daa7ec9 [formerly dda2eb89c1]]
Former-commit-id: 53c38fe54d2869c9707556e4244b69af6f55a908 [formerly 1daa0f8649]
Former-commit-id: 643624f1a9
2013-10-28 12:59:44 -05:00
Ben Steffensmeier
5ac77f7f76 Issue #2491 Fix alertviz and java 6 compatibility.
Former-commit-id: ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly ef2a281d45 [formerly 0c66089721] [formerly 27165cea30] [formerly 44a6f05986 [formerly 27165cea30 [formerly 2baf2fdd778b55b76be37503935510b057c5eb0e]]]]
Former-commit-id: 44a6f05986
Former-commit-id: 2400380daf [formerly 0e3cf8b47f] [formerly 82a83e55a2fa0b6a003492ed127ecae2ee7df8d2 [formerly 1f33a1997e]]
Former-commit-id: d4c767bc5d9a92f47044beb03900b35fdf1a24a2 [formerly 0c3bb6ef3e]
Former-commit-id: 47d3fb8249
2013-10-28 10:14:08 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Nate Jensen
7068ef91de Merge "Issue #2491 fix d2d xy bundles." into development
Former-commit-id: 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly 3843a2fe2d [formerly b8d194e4cd] [formerly ca2e057635] [formerly cda57ce742 [formerly ca2e057635 [formerly cbd9dabab1b08d2b3eb2814701bfa40d66ec5e54]]]]
Former-commit-id: cda57ce742
Former-commit-id: 91c89ad6e6 [formerly 4938d287fe] [formerly e024ea40dde60c244a0a5d34215ef2a3de55bd6d [formerly fad56e0c5f]]
Former-commit-id: 2afabcbb665bf52059f4323b46d5d543310c7c5f [formerly b48d5d53c3]
Former-commit-id: 5d8c27a87a
2013-10-28 09:31:28 -05:00
Steve Harris
719dfc4763 13.5.3-1 baseline
Former-commit-id: 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 9577afee9e [formerly 059083170d] [formerly 1d8a2026f6] [formerly 30f65c2858 [formerly 1d8a2026f6 [formerly 04f39d579bad5ebfee1e6ff9e75f49a9ed679f8e]]]]
Former-commit-id: 30f65c2858
Former-commit-id: 2fbc08d837 [formerly 06f5dcf801] [formerly 2948c5d853c374ea9e8651c7b440ddb4ecbec60c [formerly 9df3027bf0]]
Former-commit-id: be609d4b1adcd5effdcbb5631255d6839db62e54 [formerly 43610e510c]
Former-commit-id: 0e99e713e6
2013-10-28 10:30:57 -04:00
Nate Jensen
f76f5e9257 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: fa1bd6b2a4 [formerly 8aa02150c4] [formerly ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]]
Former-commit-id: 0b16e90747665fb5bad2de4fb36673726f33e59a [formerly 2741cb4348]
Former-commit-id: 8feeb6be16
2013-10-28 09:07:04 -05:00
Nate Jensen
14125ffbc6 Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a2bf6fb3fb [formerly e46c285eed] [formerly a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]]
Former-commit-id: 574be25a0b8cf316624f8a62bcea2d308e351fac [formerly 6dcd593f32]
Former-commit-id: 80e84760aa
2013-10-28 09:05:01 -05:00
Ben Steffensmeier
20d9922f17 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: 694511af94 [formerly 4eea088717] [formerly ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]]
Former-commit-id: 122ec98ee5a18fcf8773f9c00abd54bcb37bbc42 [formerly 5645da0b45]
Former-commit-id: ddd58aa99c
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
a81a780533 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 54130af4c9 [formerly a629f974a5] [formerly 88ad284e71] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]]
Former-commit-id: 3150d960e8
Former-commit-id: 13829ffd04 [formerly 237d947086] [formerly a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]]
Former-commit-id: d023f86bfbb89cb22f672fa575f06062ce7c63be [formerly 39768a50c1]
Former-commit-id: 5e0fc1b98a
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
fed726dd48 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]]
Former-commit-id: cac1f07cbb
Former-commit-id: e03a1c1202 [formerly ce9653ab15] [formerly cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]]
Former-commit-id: 65760735e4213dff6ee5ff8730b9a56f136c8d54 [formerly 3955ac729f]
Former-commit-id: 7f38aac48c
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
91e76a843a Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: ed7e75b748 [formerly 8248ea2b3b] [formerly abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]]
Former-commit-id: 3ccecf75b62e442a4753a4c621bced1a16209986 [formerly 7272087374]
Former-commit-id: 0fd0580788
2013-10-25 14:46:43 -05:00
Steve Harris
d1c823fe65 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]]
Former-commit-id: bcb531e671
Former-commit-id: 2e6e031198 [formerly 15d9848170] [formerly 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]]
Former-commit-id: d6cb813e26904b36ed5b21ea7664539b21d552fa [formerly 248e79aa2f]
Former-commit-id: f97c128cc8
2013-10-25 09:59:15 -04:00
Steve Harris
4cfed2d3dd 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]]
Former-commit-id: cbfde2f52a
Former-commit-id: a18eb8fe83 [formerly ecad06c80d] [formerly 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]]
Former-commit-id: b061ebe0205bf516b503d42df7cfdb9aacce9a06 [formerly 49b1168f5e]
Former-commit-id: d63a07d248
2013-10-25 09:45:58 -04:00
Nate Jensen
e95a9d9144 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]]
Former-commit-id: 5a99163569
Former-commit-id: 264555b5d7 [formerly b511177fa1] [formerly 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]]
Former-commit-id: aa9fcf1acc90fd6b11cfb0a4d5eca4720d7a4f65 [formerly c4161d09ba]
Former-commit-id: 213478f84b
2013-10-24 20:02:18 -05:00
Nate Jensen
b9dcdb5c57 Merge "Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler." into development
Former-commit-id: c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly c513cbaa22 [formerly 408ea200fc] [formerly b17fc59a5a] [formerly b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]]
Former-commit-id: b1244552e4
Former-commit-id: e6e0942d70 [formerly 3a1856b168] [formerly 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]]
Former-commit-id: 644254ee88425258cfd9ef4563cdae5a400c8634 [formerly 9b582b0d83]
Former-commit-id: 9dc852ba9c
2013-10-24 19:52:13 -05:00
Dave Hladky
dbdd2b4b2a Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]]
Former-commit-id: 36d7c60914
Former-commit-id: e44f20606e [formerly db33e9cafa] [formerly 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]]
Former-commit-id: a1a65c2049f48990c7a3dd437ec75aeb77d12bc8 [formerly 916f035c87]
Former-commit-id: 7f8ff13d44
2013-10-24 13:52:45 -05:00
Ben Steffensmeier
a14d315ae5 Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

Former-commit-id: f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly f98448d19f [formerly a935ffadf7] [formerly bfc3faf08f] [formerly fa0a0619bc [formerly bfc3faf08f [formerly 220f77069726f3652ca5cd1f7c100e01cf38547a]]]]
Former-commit-id: fa0a0619bc
Former-commit-id: 3b4ae67ded [formerly 09a3276d51] [formerly 0c6ad2e7a6ad44d264169d56b0486e1f819a8499 [formerly d927e6b2d7]]
Former-commit-id: af4e8832b224839d1a54437070e9f5572038a410 [formerly 5971562d1a]
Former-commit-id: d1d057ae57
2013-10-24 11:28:06 -05:00
Richard Peter
776b6ac204 Merge "Issue #2446 Added cluster lock and check for purgeable data to publish." into development
Former-commit-id: ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly ddcfb3785f [formerly 32131b3b27] [formerly 2220ce9aa3] [formerly b5072746fe [formerly 2220ce9aa3 [formerly d41377864a0a20fa6e09f6a035e33402b0d79c16]]]]
Former-commit-id: b5072746fe
Former-commit-id: ca392195cb [formerly feb1655ae3] [formerly c433dcb03f3a6c8f1b7988a97befddc483c4253f [formerly f71d65d257]]
Former-commit-id: cb8cd359a1c87b2bc7f5d6308e30c68d34e6a1aa [formerly ea9b5e6c4a]
Former-commit-id: 25e3b7e114
2013-10-23 16:57:28 -05:00
Ron Anderson
7a6209b7a5 Issue #2446 Added cluster lock and check for purgeable data to publish.
Change-Id: Ib54c1f917251eb59920254682b1c707b7fdca089

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]]
Former-commit-id: cc28fca175
Former-commit-id: 88f6e5d9d7 [formerly 0d9df14596] [formerly 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]]
Former-commit-id: bf7072abec62c42c21107a8d66df0a85d338f36d [formerly b9c5d96961]
Former-commit-id: ee845f3634
2013-10-23 16:02:40 -05:00
Nate Jensen
360066e5b8 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]]
Former-commit-id: 2f79b34a77
Former-commit-id: d2af0d52a6 [formerly 2419a99ac7] [formerly a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]]
Former-commit-id: a2aea41bda81ba451fdb55f8030f7d56d6699493 [formerly c9cdcc056a]
Former-commit-id: 41dab56b49
2013-10-23 14:52:29 -05:00
Brad Gonzales
17fe979698 Issue #2303 Fixed CAVE status messaging by fixing the setting of the UFStatus factory handler.
Amend: Also applied old patch to fix tool tips on message bar.

Change-Id: I2f83bbd07be9cb07d51c23a7e068144692f44771

Former-commit-id: 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly 3a450cd3c0 [formerly df1e60b078] [formerly 60d7a13afd] [formerly e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]]
Former-commit-id: e3883dba15
Former-commit-id: a6b82470eb [formerly 086dfe9ebc] [formerly 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]]
Former-commit-id: 1ca501591be07777618ac2ea857a9cccc4228ac9 [formerly 5b5bb8975d]
Former-commit-id: f71babda9a
2013-10-23 14:13:03 -05:00
Lee Venable
2bf50b46b9 Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]]
Former-commit-id: 3d6547d644
Former-commit-id: 0d399cc52a [formerly 25c7bd679f] [formerly 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]]
Former-commit-id: f5083a1cd8fdfc81b02738eb21c687f754459c86 [formerly 8f1956da81]
Former-commit-id: ce35925120
2013-10-23 08:26:49 -05:00
Nate Jensen
a30f43298f Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]]
Former-commit-id: 88ca2a78de
Former-commit-id: 223337178c [formerly 250f553532] [formerly a55807d37bbef25e8d8929bb33fd3ccf74c0257c [formerly 173e28b9d9]]
Former-commit-id: a5612755d90d9271066ed3e8223e83ba23762362 [formerly 00307deae3]
Former-commit-id: 3726903ddc
2013-10-22 13:05:22 -05:00
Nate Jensen
3c9107b0dc Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]]
Former-commit-id: 938e4a3073
Former-commit-id: 9a6f474b0b [formerly 621eaab03a] [formerly 7b549b23c7a05b00918c0b4e70c2fde2005dabc1 [formerly d1ff15485c]]
Former-commit-id: 9f6b770f3d75d9f48fcf482b50635b65aa5b55cf [formerly 4f4af22201]
Former-commit-id: 4a1d2cfad5
2013-10-22 12:42:41 -05:00
Slav Korolev
08aaa44cc9 Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]]
Former-commit-id: 981544290e
Former-commit-id: d56f7ca3a9 [formerly d0aa6f6f26] [formerly 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]]
Former-commit-id: 79a91e7b36c647374275b3525cb86e52f815bf12 [formerly 0ea9efa8dc]
Former-commit-id: 3324392dad
2013-10-22 12:34:34 -04:00
Nate Jensen
61edc6b315 Merge "Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image." into development
Former-commit-id: 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly 09ec04b9f4 [formerly 4aa40ad61a] [formerly 50bf735240] [formerly aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]]
Former-commit-id: aa0554d073
Former-commit-id: b1a5a615f3 [formerly a58f2a6c10] [formerly ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]]
Former-commit-id: 1a926d99f4a7450015cd3c55043625a807584cbd [formerly fb879cfc00]
Former-commit-id: 4d18c2cc4e
2013-10-21 14:44:17 -05:00
Slav Korolev
aac48cb961 Issue #2451. Get highlighted rows on the table page after message update. Corrected.
Former-commit-id: 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly a7883aabd3 [formerly d0d4f12057 [formerly 652094eb318459b1b73924ebba2b542b5f97eaff]]]]
Former-commit-id: a7883aabd3
Former-commit-id: da1acc7fff [formerly d5315c8f57] [formerly 08093b85ce58869330a7d6751c6f0a99e4322a03 [formerly 1d5a028ee1]]
Former-commit-id: 3666c28f3043bac34197daab36e0ae46547f4ec6 [formerly 6fe718d141]
Former-commit-id: 41a27352a0
2013-10-17 16:39:26 -04:00
Nate Jensen
0ca327d293 Merge "Issue #2361 fix scan alarm dialog" into development
Former-commit-id: b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 3a8650ef28 [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: 9dd39289ef [formerly 32ecd61eae] [formerly f2c56097835e64f08a5d48331e7d3b30ef221a5d [formerly 64fdaa70d7]]
Former-commit-id: c51dde3dede79cee33009add35b4685dbb824a18 [formerly 2b3fc9fbc4]
Former-commit-id: 21585af43f
2013-10-17 14:20:52 -05:00
Nate Jensen
85b08d82c4 Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426

Former-commit-id: 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 81fd87d9dd [formerly 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]]]]
Former-commit-id: 81fd87d9dd
Former-commit-id: ca63e8a2ee [formerly de55e62614] [formerly 3d0e510f23ea361cf143bfcee0bba966812d2c43 [formerly 4cd95b545b]]
Former-commit-id: 2febf7adf758c1dc164341a41c7debbbf9d50144 [formerly 17015834e9]
Former-commit-id: 33634c9cab
2013-10-17 13:55:19 -05:00
Slav Korolev
d362851509 Issue #2455. Fixed a problem with Changes Applied window. Corrected.
Former-commit-id: ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly 4100629b39 [formerly 93b69bd6a7 [formerly c07a918474361d83907fb8de03538ec88486016d]]]]
Former-commit-id: 4100629b39
Former-commit-id: 80b0798d4f [formerly b3ec990f41] [formerly 9cc2d94fd6c5402787966d92170a9231e42ba36d [formerly 552789c978]]
Former-commit-id: 6715466f9b955837b01362479c75beb22132958d [formerly da45dbe1cb]
Former-commit-id: f3bc00b095
2013-10-17 14:17:11 -04:00
Max Schenkelberg
6608295c6a Issue #2333 Merging gl refactor from GOES-R work. Preparing GL for data units in image.
Change-Id: I6ec7c0808516cc1ce87e3325b54041366392d191

Former-commit-id: 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 3ec1b334cd [formerly 08cafadf8f] [formerly 676493c6e2] [formerly 004720f7a9 [formerly 676493c6e2 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]]
Former-commit-id: 004720f7a9
Former-commit-id: af48a7e839 [formerly df3b18d237] [formerly 28d6f1e7606f37b873f1fed4610372d4a7014d7e [formerly 872652cab9]]
Former-commit-id: 5e783b2b5264365d80083fc6e37feb8602478bd8 [formerly d19010b129]
Former-commit-id: df73f86805
2013-10-17 12:59:23 -05:00
Nate Jensen
0f702b917c Merge "Issue #2460 Product browser display of adhoc subscriptions Change-Id: I9c045b781adb41468d395b67a837c9a862744447" into development
Former-commit-id: 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly c8633d47cf [formerly 8ef0c6e84e [formerly 261a4f821cf2276849f3aab67f407147448ed979]]]]
Former-commit-id: c8633d47cf
Former-commit-id: 5637ba654f [formerly 1ca5f5fb4c] [formerly 3e0d80ff1a8f1fa9f0d4d551118a63138ae2a7e7 [formerly 268da5555e]]
Former-commit-id: 4d7d972d3a2d0b899fe5d562693efaa21888d703 [formerly 3490e0556f]
Former-commit-id: c26d55c517
2013-10-16 15:14:42 -05:00
Nate Jensen
343c2efd82 Merge "Issue #2389: Update NotificationManagerJob" into development
Former-commit-id: 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 697d0f8853 [formerly 4d7125ecc5 [formerly 9bd7ddeeb1e850eb1f8729f556fa46d5c70dc342]]]]
Former-commit-id: 697d0f8853
Former-commit-id: 128de383e2 [formerly 8f9ca27d50] [formerly fa6ee5f1dc33049e03880939e3155710f83ede24 [formerly b11c8e5c06]]
Former-commit-id: 8035686ac272bf01049f7c9ff6f557508223f647 [formerly 5ac7bc57f2]
Former-commit-id: 209d938d7d
2013-10-16 09:33:25 -05:00
Dave Hladky
e9dec56920 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: aa5fd1ba3f [formerly 9880c82a36] [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]]
Former-commit-id: c88b0194e09755a944f026679b6a3c33a0aad9c3 [formerly 8a1f070927]
Former-commit-id: 33bd8d5cc4
2013-10-16 09:06:00 -05:00
Richard Peter
75d2a9e30a Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development
Former-commit-id: 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly e1a0403c01 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]]]
Former-commit-id: e1a0403c01
Former-commit-id: bd18628df9 [formerly 00f89efbca] [formerly 020e5955a6649bd7d4bb4c47058c6a42a54c0392 [formerly 4c983c7429]]
Former-commit-id: a564bbbd30c335f47363be07d4322f13adf3bcd8 [formerly 9b83504b42]
Former-commit-id: 00ea2b7c6d
2013-10-15 16:36:38 -05:00
Ben Steffensmeier
3af445a37a Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 50f81cf656 [formerly dcae8c6aa2] [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677]]
Former-commit-id: ec49165c9e367122a2e3115a12c8a3e00aa1dbca [formerly 92828fbaa0]
Former-commit-id: 9ed413f0c2
2013-10-15 16:30:38 -05:00
Nate Jensen
fdfcd1ae84 Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 84b16b89b5 [formerly 521c019757] [formerly 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]]
Former-commit-id: 5e12a372b6d817c05bc8593e1177b5c178c81b98 [formerly 4b2855e7cb]
Former-commit-id: ed1eb0adaa
2013-10-15 14:23:59 -05:00
Richard Peter
929a8dd118 Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 210927720b [formerly 9896b051c1] [formerly 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]]
Former-commit-id: 18e091b61bbc0c33f4f15918e97355378cbc6ded [formerly 03a58dabb2]
Former-commit-id: a8f823447e
2013-10-15 11:36:12 -05:00
Mike Duff
d09d95d827 Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly a9c8797e9e [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]]]
Former-commit-id: a9c8797e9e
Former-commit-id: 5933d330b9 [formerly 367b98e07f] [formerly 50ee7818c09a698535754beff5d683b662eb6675 [formerly 7dd6e09fe1]]
Former-commit-id: a521741947a3c2dbd26dee82673f10b7263abc66 [formerly 38cd3be19d]
Former-commit-id: e44215cb2e
2013-10-15 11:18:52 -05:00
Richard Peter
035a39e83d Issue #2389: Update NotificationManagerJob
Change-Id: I3fa926a78a50e9cb6fba7ed98c6560528e3cd7e6

Former-commit-id: 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly f84c7e9607 [formerly 5365515f28 [formerly dbf2c35fcae26d261827758318f712641937d989]]]]
Former-commit-id: f84c7e9607
Former-commit-id: 93000196be [formerly 1a999c52c2] [formerly 924a10958d9381d9077f1691ced1188d3bbab299 [formerly 9da7b5bd5f]]
Former-commit-id: 87ffb8dac747aea5d53478f82d9c7d81ed01af83 [formerly 3ea1646de0]
Former-commit-id: 82d04f3d81
2013-10-15 11:07:51 -05:00
Richard Peter
afa133d934 Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: aef98d5342 [formerly 60e49cf211] [formerly 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]]
Former-commit-id: 07d5598219b5927f367203b4d925b4a229cddc5e [formerly 134b78044d]
Former-commit-id: 3c88cf005f
2013-10-15 10:49:13 -05:00
Ben Steffensmeier
7a2089f2dc Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

Former-commit-id: d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly 94560e37c8 [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]]
Former-commit-id: 94560e37c8
Former-commit-id: 253ada50d5 [formerly c960405800] [formerly f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06]]
Former-commit-id: d5e54c8a6cadae9ca6e0e739c958b4f515534447 [formerly 2b831863c5]
Former-commit-id: 2f9bc8f6de
2013-10-15 10:48:29 -05:00
Mike Duff
33dbdaadf7 Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682

Former-commit-id: e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]]]
Former-commit-id: 65c693d5c4
Former-commit-id: 4b3f55662c [formerly 7bcffa5275] [formerly b2ab42e078ad49f585ba986c8d78ecffb7953af6 [formerly a49af4489e]]
Former-commit-id: 6e0823d08bb44ffed23e514464501e6d0b517d9d [formerly 21323fe41c]
Former-commit-id: 728959d0f8
2013-10-15 09:52:08 -05:00
Nate Jensen
3bde4778a5 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]]
Former-commit-id: 23e1817385
Former-commit-id: 95f1de78e5 [formerly eabc32a720] [formerly f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]]
Former-commit-id: e12ea8f6137c2af3a337f0c56336dc6a4130ef1e [formerly 926c2ffbd7]
Former-commit-id: 528ce9cb2c
2013-10-14 16:26:47 -05:00
Mike Duff
881e2eb62d Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 5913f21dd6 [formerly c4e3b900c9] [formerly 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]]
Former-commit-id: c66a8efe9c3d8a5536c47e3a9f958394809acd02 [formerly ffbbf04f05]
Former-commit-id: 14d907ac01
2013-10-14 15:42:28 -05:00
Nate Jensen
239711078f Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]]
Former-commit-id: 40847d0edf
Former-commit-id: 9d1df167be [formerly d84f47b609] [formerly 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]]
Former-commit-id: c8ae0a88008c418e7419cfb8e0c8c5886ca02adc [formerly b506ef6a8d]
Former-commit-id: bae5313482
2013-10-14 15:30:09 -05:00
Lee Venable
402928a033 Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]]
Former-commit-id: f3a9e541a1
Former-commit-id: bdbbcbb36a [formerly 87e40ae6b1] [formerly 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]]
Former-commit-id: ae8069f627db2670873bab2747f8719ea6f9a520 [formerly ad96ec04a4]
Former-commit-id: 921c61e094
2013-10-14 12:42:27 -05:00