Commit graph

4099 commits

Author SHA1 Message Date
Bryan Kowal
fc1ac25dd2 Issue #2297 - fix 14.2.1 CAVE build.
Former-commit-id: 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly 8514f712fe [formerly 476c19464d] [formerly 8b3f402dd8] [formerly de09a30a4d [formerly 8b3f402dd8 [formerly d71631f5cabae72a1ceb30f36ce574b2559c235d]]]]
Former-commit-id: de09a30a4d
Former-commit-id: 534db16695 [formerly b8d164bb71] [formerly 8ab460e815a19bf685445346eb309cab37331493 [formerly 3eeefe9e56]]
Former-commit-id: b111380874f008f7cb0bdfbcb45e874f1d6920d3 [formerly c7a890d8c2]
Former-commit-id: ab3041ff05
2013-10-15 16:07:23 -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
Nate Jensen
a25baa08fc Merge "Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins" into development
Former-commit-id: 9acb414570 [formerly 78f641d082] [formerly 040918f9a4] [formerly 9acb414570 [formerly 78f641d082] [formerly 040918f9a4] [formerly d7c9a39d16 [formerly 040918f9a4 [formerly 445f2c0779e98ed7277c8ff95552d062f7b70197]]]]
Former-commit-id: d7c9a39d16
Former-commit-id: c328d581cc [formerly 4e5db943b2] [formerly d3bb0beba9a02cac129348cbac085050de08447d [formerly 7256edab5a]]
Former-commit-id: e23983e1c8fc3a8fffa3cba072b6fa32232fe4ea [formerly 4c8eebfb27]
Former-commit-id: 656d206a55
2013-10-15 11:21:39 -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
Ben Steffensmeier
acfc7318b4 Issue #2402 Up grib split to 2 threads make it configureable.
Former-commit-id: 5facc316a8 [formerly b089df5ca1] [formerly d644235fe1] [formerly 5facc316a8 [formerly b089df5ca1] [formerly d644235fe1] [formerly 29e77f2e6c [formerly d644235fe1 [formerly f3308c200407bae39175f2620559c6489aa5c788]]]]
Former-commit-id: 29e77f2e6c
Former-commit-id: 57a93ec3b8 [formerly f82a3ee63f] [formerly 5f642b260d2dce3d25572a8f35b68043bb3074e4 [formerly 4f7eca694d]]
Former-commit-id: 643c79d2a342536c3727a7c020ca29d85a9f9f40 [formerly c84a96a4d9]
Former-commit-id: b6bf3bd4bb
2013-10-15 10:59:50 -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
Nate Jensen
c8cb2cdf16 Merge "Issue #2386 - Fix for editing subscriptions from subscription manager dlg." into development
Former-commit-id: 19f1b3533b [formerly e0ee9b214e] [formerly d1352e9a58] [formerly 19f1b3533b [formerly e0ee9b214e] [formerly d1352e9a58] [formerly b6a217cbcb [formerly d1352e9a58 [formerly 0e4624542246e74d9a3a724f9539975da310ca0b]]]]
Former-commit-id: b6a217cbcb
Former-commit-id: 6808bd3de1 [formerly daed7455f0] [formerly c32c4a88cad80a357a4147214c417a7ac0010628 [formerly 94457cab3e]]
Former-commit-id: 675a81803a2f7666f7966cb8656086aa1291ef12 [formerly 9431adb6f8]
Former-commit-id: 34fbfe6403
2013-10-15 10:26:34 -05:00
Nate Jensen
b7b42e65fc Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739

Former-commit-id: 6437ca3524 [formerly 145b6fffce] [formerly 6c2ff04b69] [formerly 6437ca3524 [formerly 145b6fffce] [formerly 6c2ff04b69] [formerly f82364f18e [formerly 6c2ff04b69 [formerly 065be6691bf102699dc7ece3424f6972792c4d6f]]]]
Former-commit-id: f82364f18e
Former-commit-id: e624f85829 [formerly 522393bf45] [formerly 2f822db8e09769a244d22e12165589f6a7d39728 [formerly ffe1c83166]]
Former-commit-id: 6d9bd9b4987b64534a45e366db9b99f1d58f3e54 [formerly 8ef212412f]
Former-commit-id: a1b4580a88
2013-10-15 10:08:15 -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
2a541f0c58 Issue #2361 fix SCAN Alarm errors
Change-Id: I6c47a38dd3b5c107188fbaabec859448b516bb8b

Former-commit-id: b5d99172fd [formerly 89bf42161b] [formerly 0f8ecc7c48] [formerly b5d99172fd [formerly 89bf42161b] [formerly 0f8ecc7c48] [formerly 9069dc9a0c [formerly 0f8ecc7c48 [formerly cac9beb945a4edccc5c4304e8d6d02e5ed0fd144]]]]
Former-commit-id: 9069dc9a0c
Former-commit-id: a7f9b3ecb5 [formerly 3c8f7101d5] [formerly 02691b73fce3638db53fe45b61d6f6fc33ad6f95 [formerly f8c23ec052]]
Former-commit-id: 7fbbe4d3f2a9c4206b77574a59fade8725157515 [formerly 32c92e9bb8]
Former-commit-id: 0a2fcd84c8
2013-10-15 08:53:12 -05:00
Bryan Kowal
08fcd810c5 Merge branch 'development' into development_on_RHEL6
Former-commit-id: 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly 49dd7daf05 [formerly 3f4263fa07] [formerly a929dec887] [formerly c13018301e [formerly a929dec887 [formerly b3e74019d1a8550c1c7cbebe219dee3ba7e603b3]]]]
Former-commit-id: c13018301e
Former-commit-id: 07b0c95cb8 [formerly f731c424bb] [formerly 01f5de1dacc767ea28030a4861c52d252dbd57ba [formerly 0a06af1fdd]]
Former-commit-id: b86c85fd3da49ecc68392ee5a3b1ab792326e1f0 [formerly c846630ac7]
Former-commit-id: 5a8bfe3756
2013-10-14 17:58:22 -05:00
Richard Peter
5b565b110e Merge "Issue #2361 fix build" into development
Former-commit-id: 49cb49baba [formerly aab5187185] [formerly b7db7c0c2c] [formerly 49cb49baba [formerly aab5187185] [formerly b7db7c0c2c] [formerly 5173e00254 [formerly b7db7c0c2c [formerly 29e94325e3b1dbe949051650091854a152800ac9]]]]
Former-commit-id: 5173e00254
Former-commit-id: 724c71ccd8 [formerly b55f1f7d35] [formerly faea6a056b26381e3324a4342bb12db5c77414ca [formerly 250d2fcf37]]
Former-commit-id: 10357693fb037312664821425fe8551f059f61ba [formerly 09abe7175b]
Former-commit-id: 8879e8b15e
2013-10-14 16:39:44 -05:00
Nate Jensen
f44f92c3da Issue #2361 fix build
Change-Id: I7c93d2be6a04d3414db14e97d0a6a9b2d928ffbd

Former-commit-id: d103e67426 [formerly 2ae2b7faab] [formerly 1e3af0bd1f] [formerly d103e67426 [formerly 2ae2b7faab] [formerly 1e3af0bd1f] [formerly 0adc85a58a [formerly 1e3af0bd1f [formerly d90dae07bd4507c96bb60a4ed372f206aeac74a7]]]]
Former-commit-id: 0adc85a58a
Former-commit-id: 4a555210cc [formerly 45c65ddffd] [formerly bdae1a43acecf14bccd2238a2af4062982798c09 [formerly aecb906e82]]
Former-commit-id: 62a5a660eeca69e69084ad724cd1f88f5ce8127a [formerly 711a22eba6]
Former-commit-id: b2442da9a8
2013-10-14 16:37:52 -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
Richard Peter
2e868d23cf Merge "Issue #2468 compare DataTime without Calendar. Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59" into development
Former-commit-id: 20ae99b316 [formerly fe606f370e] [formerly 9fa7f87769] [formerly 20ae99b316 [formerly fe606f370e] [formerly 9fa7f87769] [formerly 952f7be167 [formerly 9fa7f87769 [formerly c45932f98cfeb3b4054b8c632e477c6b344590b7]]]]
Former-commit-id: 952f7be167
Former-commit-id: 37491ee4e2 [formerly a0d6c8dd00] [formerly 6c02ad235e39a481d264786eff028e259a749bb8 [formerly e656cf1a4c]]
Former-commit-id: 843dfffb2b6a586e83af69e34c2ab4d9fc662ad1 [formerly 270dd63f56]
Former-commit-id: 317334b779
2013-10-14 15:43:59 -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
Ben Steffensmeier
297f219049 Issue #2468 compare DataTime without Calendar.
Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59

Former-commit-id: fa304d28a6 [formerly 7901fd821e] [formerly 27758e3e7f] [formerly fa304d28a6 [formerly 7901fd821e] [formerly 27758e3e7f] [formerly 88d9dd4a9d [formerly 27758e3e7f [formerly c988286b20545bbe7e7dab3d717ebd7f78968048]]]]
Former-commit-id: 88d9dd4a9d
Former-commit-id: cc521e9742 [formerly 1e6fe1a4ef] [formerly 562cd76a49db8306a459ab71be58664e0374fd7b [formerly 18b8371f4c]]
Former-commit-id: 63527376a213f976e47d5686be7bf077aaec5cea [formerly 878eba3cda]
Former-commit-id: b3acb79683
2013-10-14 15:37:25 -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
Ben Steffensmeier
2e6c50b015 Issue #2402 Drop grib split to one thread, remove LargeGribFile from ISerializeableObject file.
Former-commit-id: dcf275dbc3 [formerly 75cef40e49] [formerly cb37bc8e38] [formerly dcf275dbc3 [formerly 75cef40e49] [formerly cb37bc8e38] [formerly afe18f40e6 [formerly cb37bc8e38 [formerly 0b0476bf4df65366fb4bfe8cbead30dde1620054]]]]
Former-commit-id: afe18f40e6
Former-commit-id: cd2ad3dd0b [formerly 1f68a68d02] [formerly c06cadf8da2180a759be6d6815884e1dec901ed4 [formerly 66d74b3884]]
Former-commit-id: 905860b4639ddd542a3ef0fe0504aba32d9bc6fd [formerly 86dc473dbe]
Former-commit-id: f4eb194fba
2013-10-14 11:46:57 -05:00
Nate Jensen
38569c4203 Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly abf2fa50b7] [formerly d8bd120a11 [formerly b328e8dec5] [formerly abf2fa50b7] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 0059665def [formerly 48445dd8cf] [formerly 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]]
Former-commit-id: 73a271d11819bb6689c4636ae2a486561e412fc9 [formerly 3bbebda385]
Former-commit-id: 41a8aec534
2013-10-14 11:42:23 -05:00
Nate Jensen
5b39a9d637 Merge "Issue #2333 Removed more unused fields from satellite record" into development
Former-commit-id: 72cea9a79b [formerly d60c08024f] [formerly 01b534fc5a] [formerly 72cea9a79b [formerly d60c08024f] [formerly 01b534fc5a] [formerly b9cf1a6533 [formerly 01b534fc5a [formerly 49ba8c831ec6318b82d66372c8370b97070733dd]]]]
Former-commit-id: b9cf1a6533
Former-commit-id: 8442503010 [formerly 89a7c7a4fe] [formerly 6b0133f62a6a2ded3efd1d24e3d4f04b8fb13933 [formerly 480acfddfb]]
Former-commit-id: fad09136c1d94fa1dc46b61ed7abc340ec9144b4 [formerly 72a5e48967]
Former-commit-id: 8a20da4bed
2013-10-14 11:41:45 -05:00
Richard Peter
af8d209b6d Merge "Issue #2402 Remove excessive grid point count output." into development
Former-commit-id: 2dec51d9b8 [formerly fa3d3ad219] [formerly 8466d69993] [formerly 2dec51d9b8 [formerly fa3d3ad219] [formerly 8466d69993] [formerly ac61eedd88 [formerly 8466d69993 [formerly ef68e9c3459e1e1cf40b433e05e0c6beea5f18e0]]]]
Former-commit-id: ac61eedd88
Former-commit-id: e13d9f0fed [formerly fdef1c8039] [formerly 6c2bcc48209bc3015608c9d5046e2c3b60853106 [formerly 3af222d8da]]
Former-commit-id: efff2406fafb60ef05583eff85e0471ad6d1edc3 [formerly 70ed87f63e]
Former-commit-id: 2de870f634
2013-10-14 11:16:03 -05:00
Richard Peter
428110bd5d Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]]
Former-commit-id: c056c93104
Former-commit-id: 6a0020cf1c [formerly b6d6458ab2] [formerly 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]]
Former-commit-id: 3898c068a270fd8813d440cf2d7ec8e0d0cf5641 [formerly f4de754699]
Former-commit-id: 9f992d6768
2013-10-14 11:15:40 -05:00
Ben Steffensmeier
224e9aced6 Issue #2402 Remove excessive grid point count output.
Former-commit-id: 70416f3d59 [formerly 944aee22c9] [formerly a42c0654f5] [formerly 70416f3d59 [formerly 944aee22c9] [formerly a42c0654f5] [formerly f290019e64 [formerly a42c0654f5 [formerly 4c25d75411a8c28cc2a2511c8d3a4876eaaa7be4]]]]
Former-commit-id: f290019e64
Former-commit-id: 096ff46a78 [formerly bc215e7276] [formerly ecc7464ebaf80387216a12b10848191a76c2b320 [formerly 18e33cba9d]]
Former-commit-id: 42c741b23bea7135d9514f73d8ff07addedb113f [formerly f8e1ac1db5]
Former-commit-id: 45771a6119
2013-10-14 11:13:03 -05:00
Steve Harris
ccf5593d6f Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java

Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]]
Former-commit-id: 545d7ca463
Former-commit-id: cc5e19f181 [formerly 2f0968a279] [formerly 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]]
Former-commit-id: ec984ebc0429ce76175c36247419724dd543f7d7 [formerly 714ebfb6d0]
Former-commit-id: cb671862ff
2013-10-14 09:28:24 -05:00
Greg Armendariz
002280d759 Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: b379f7d077 [formerly 14d90768e0] [formerly aa0d3bdab4] [formerly b379f7d077 [formerly 14d90768e0] [formerly aa0d3bdab4] [formerly 01a1ada89b [formerly aa0d3bdab4 [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]]]
Former-commit-id: 01a1ada89b
Former-commit-id: dd365e604a [formerly f53973e153] [formerly 5a79b44b0bb7fd3c3b1aa9bf3c9a3731094ee598 [formerly 0d066c50cd]]
Former-commit-id: 921d07ddc3f9a62d9b7b8a9915a9bfc9cf84bc31 [formerly 0d62d1886c]
Former-commit-id: 57728ed486
2013-10-14 09:08:05 -05:00
Steve Harris
07cacc9234 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 99dac05b85 [formerly d1f38eb936] [formerly 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]]
Former-commit-id: 515de7689b19f5b8b1400a09fd953e907cea786f [formerly b74898370f]
Former-commit-id: 03953804b3
2013-10-14 09:59:31 -04:00
Mike Duff
07da86f077 Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]]
Former-commit-id: a69120c623
Former-commit-id: 27fd5ba0fa [formerly 610c937a00] [formerly 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]]
Former-commit-id: d7fa01a403613e0c322898b648e1b5619df67008 [formerly eaa8e67afd]
Former-commit-id: bcabea1df2
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
63aee4d933 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 44613a0c61 [formerly ae94d39ce2] [formerly 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]]
Former-commit-id: 9dc862eaea127586ca7a3e51fe98ae5c9e020e8e [formerly a129474a80]
Former-commit-id: 0305d62673
2013-10-11 16:25:28 -05:00
Max Schenkelberg
2e77b6bdb9 Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec

Former-commit-id: f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly f34750cb5f [formerly 3c2492cdbe] [formerly b68b8de21b] [formerly 8fddd5a57b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]]]
Former-commit-id: 8fddd5a57b
Former-commit-id: f28272fa6e [formerly 9bd27e3c43] [formerly f41b2ac789434c1654f92e97b783cd78ec044300 [formerly 3b53d18be4]]
Former-commit-id: dd7ba2c0ac1354ae9cfc967b5ccd480daaad4e5f [formerly 67491d2af0]
Former-commit-id: 2bc44908ff
2013-10-11 16:17:52 -05:00
Richard Peter
cfc194f270 Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly 0a802a9218 [formerly ea74adff8f] [formerly a99e286c0f] [formerly dba525c5e6 [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]]]
Former-commit-id: dba525c5e6
Former-commit-id: d3598aaffb [formerly 6dbdecfb9a] [formerly eba7342fd247b0069dd81a78c0141f3af11af599 [formerly 2d1963c665]]
Former-commit-id: fed529049b0cde68d4db324452ff2a38969a6783 [formerly 14df7cc0c1]
Former-commit-id: bdc7d9e7d8
2013-10-11 15:34:31 -05:00
Nate Jensen
5d0190d1db Merge "Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran" into development
Former-commit-id: e11a93f252 [formerly 2a069e8cf2] [formerly 88f83a842e] [formerly e11a93f252 [formerly 2a069e8cf2] [formerly 88f83a842e] [formerly 1b2024a69d [formerly 88f83a842e [formerly 2de15863597a3fc86ff11415de9c1bbec26b12e8]]]]
Former-commit-id: 1b2024a69d
Former-commit-id: 547cc917ea [formerly 475050f32d] [formerly 64d696225d49028fd5a65de790c4db9d545f6e7b [formerly e5b854964d]]
Former-commit-id: 3a2596d27278f82066d36356773d26ef9a5eabe6 [formerly 327bb053af]
Former-commit-id: 6a0d7c3e88
2013-10-11 15:33:42 -05:00
Ben Steffensmeier
a5b8118b3c Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d

Former-commit-id: 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 38ac706b80 [formerly 2de4562585] [formerly 3fd473e25d] [formerly 0ecab8d44e [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]]]
Former-commit-id: 0ecab8d44e
Former-commit-id: 46e676c816 [formerly 0a125ce17b] [formerly bd8e77a0c857b6855c5e1bd662bfd797af1e0932 [formerly 78b278e4ef]]
Former-commit-id: 42f20bfbf1bf91b7d11aa8c27b6275d438752828 [formerly 3f554d680f]
Former-commit-id: fb0f53feb8
2013-10-11 15:22:32 -05:00
Max Schenkelberg
47fa5c9a49 Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231

Former-commit-id: 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 819df41147] [formerly 5cecf2a1d6 [formerly 8e1a0cb397] [formerly 819df41147] [formerly 67bfa28850 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]]]
Former-commit-id: 67bfa28850
Former-commit-id: f8795885f5 [formerly fe93c69429] [formerly f3c95fbb85e13f19cb86ae341c6d8e60d4b3c216 [formerly 50fd97a5d5]]
Former-commit-id: 5763e7d2f08d06cf22dde76f06aea16ac83f7c26 [formerly e8be0b3728]
Former-commit-id: 99d63398a3
2013-10-11 14:29:11 -05:00
Lee Venable
a52447c65a Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]]
Former-commit-id: 06a38bd123
Former-commit-id: ca1a404c58 [formerly 3e95f8feb8] [formerly 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]]
Former-commit-id: 139e0f8cc5c19de048741f3e8e26f3bf9abee324 [formerly 34b2bbc487]
Former-commit-id: 913b363cc9
2013-10-11 13:02:35 -05:00
Max Schenkelberg
332c2d91a1 Issue #2333 Updated upgrade script to only run against entries in satellite_spatial that have not already been updated. This is so the upgrade script won't break the satellite data if it has already been ran
Change-Id: Ibe2206e584e89a40d4cdd1a2b50e91e10c885ae0

Former-commit-id: a0abc34322 [formerly 06603cabe5] [formerly fbc06d81f7] [formerly a0abc34322 [formerly 06603cabe5] [formerly fbc06d81f7] [formerly 41b6f79c52 [formerly fbc06d81f7 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]]]
Former-commit-id: 41b6f79c52
Former-commit-id: 0b80a9f69a [formerly 3aa9f8cc42] [formerly 2d15674f89c9b59567e7509f08ac8ada299b6ac8 [formerly dd99767050]]
Former-commit-id: 68356d2d826fc2f0b0e93b5ab0c894325565c849 [formerly 239d0e52ea]
Former-commit-id: 11980c92ae
2013-10-11 12:14:21 -05:00
Nate Jensen
445acd4997 Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]]
Former-commit-id: d5d0fab53b
Former-commit-id: d3e361eaa4 [formerly fd3a19a73c] [formerly bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]]
Former-commit-id: 14d624993f388eb4c6ef74658886d48d65a93bf0 [formerly 184d23719b]
Former-commit-id: a6535a0494
2013-10-11 11:21:18 -05:00
Lee Venable
27e147ce0a Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: ffe192037c [formerly cec4aecdaa] [formerly 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]]
Former-commit-id: af9d2a5d5c5d15fce00cc7930b6e73f84902150c [formerly 7335826e3f]
Former-commit-id: 98baa074a2
2013-10-11 11:09:57 -05:00
Brad Gonzales
c49808a723 Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
       Fix GriddedTime addCycles when cycles are empty.

Change-Id: I9fa27178e5f59252cb872314493256be7f038890

Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6 [formerly 5825fa41d6] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9]
Former-commit-id: feef0a0b55
2013-10-11 10:36:53 -05:00
Max Schenkelberg
de1a256c47 Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments

Change-Id: I78649dd0268b030624888544740a8d7af3e83e97

Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]]
Former-commit-id: 01c0e022d5
Former-commit-id: 98b60f0050 [formerly dfd6ffabd8] [formerly d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]]
Former-commit-id: 483819660d2cb4b6cc4872b4a95029a3370fc251 [formerly 3c2f370688]
Former-commit-id: a9a73d12cb
2013-10-11 10:21:37 -05:00
Ron Anderson
42b1ed9e94 Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly fe072b8a46 [formerly 1d74ec7b95] [formerly 3e260a58d9] [formerly 584a782545 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]]]
Former-commit-id: 584a782545
Former-commit-id: fd4a1ff6d3 [formerly e421c4c24f] [formerly 82f9833f21f1dafefc410114667acf49e4900722 [formerly d13c6943da]]
Former-commit-id: 1f70048c8a9b07c91ed012d8994bccf6842845fb [formerly 5b87108b39]
Former-commit-id: 846b12a916
2013-10-10 18:03:36 -05:00
Nate Jensen
9f138b378f Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: 6a4a5789f8 [formerly d410323a97] [formerly baac824e68] [formerly 6a4a5789f8 [formerly d410323a97] [formerly baac824e68] [formerly 3dbf65f001 [formerly baac824e68 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]]]
Former-commit-id: 3dbf65f001
Former-commit-id: 75447a2206 [formerly 690ec74226] [formerly 397ba345eb6a3098f62b78a3cc7d6948c4e6f75a [formerly 117fd8377a]]
Former-commit-id: 39a431b5d7cb00600d9b47592950e3681be1732f [formerly 4abdb19dc4]
Former-commit-id: b2750336a0
2013-10-10 17:38:22 -05:00
Nate Jensen
f19d751d47 Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28

Former-commit-id: 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly 9061866d58 [formerly fa2a7db710] [formerly 8aecb21306] [formerly dc60f94a34 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]]]
Former-commit-id: dc60f94a34
Former-commit-id: d3e0340f3d [formerly a75c66778b] [formerly 4f809ea030f0b5f024efb499a22c552717e6efbe [formerly ef92804824]]
Former-commit-id: a86c99d52b6de9ccb07ad9ea0188560e8fa37e0c [formerly d9573cb7ca]
Former-commit-id: 47ae29e37a
2013-10-10 17:38:01 -05:00
Ben Steffensmeier
44b677853b Issue #2376 Fix STI parsing
Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5

Former-commit-id: 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly 0f77e750f6 [formerly 29f3ac17f1] [formerly abf0df45c4] [formerly f1699b1d62 [formerly abf0df45c4 [formerly 4af47a67091e0249c01289f275d44756f04e50d3]]]]
Former-commit-id: f1699b1d62
Former-commit-id: babdf64cc4 [formerly 9066930aec] [formerly 0792017648e0b6674aed4c03b8d36b760d6405c7 [formerly 5abf856ccb]]
Former-commit-id: 1a50dfeea701dbabeeaa00426b6c40d5cebade96 [formerly 799629c7c6]
Former-commit-id: c51d801aef
2013-10-10 15:47:54 -05:00
Lee Venable
5bf5c7bb79 Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]]
Former-commit-id: feb40aada0
Former-commit-id: 2174aea7fc [formerly 93b93a6750] [formerly e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]]
Former-commit-id: a1565c82d3b4f93080c914a6d50b946a5d18f82f [formerly ff8eebf909]
Former-commit-id: 334fc2ce6b
2013-10-10 15:29:28 -05:00
Lee Venable
9163052049 Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]]
Former-commit-id: 6282814c91
Former-commit-id: 1fa0a9e763 [formerly 00f14ba5da] [formerly 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]]
Former-commit-id: 2aa030ac0f467b0901a7da0f8784e23c3527851c [formerly f3c7750f8e]
Former-commit-id: e85f79ec82
2013-10-10 15:26:04 -05:00