Commit graph

3968 commits

Author SHA1 Message Date
Nate Jensen
3490e0556f Merge "Issue #2460 Product browser display of adhoc subscriptions Change-Id: I9c045b781adb41468d395b67a837c9a862744447" into development
Former-commit-id: 8ef0c6e84e [formerly 8ef0c6e84e [formerly 261a4f821cf2276849f3aab67f407147448ed979]]
Former-commit-id: c8633d47cf
Former-commit-id: 268da5555e
2013-10-16 15:14:42 -05:00
Nate Jensen
5ac7bc57f2 Merge "Issue #2389: Update NotificationManagerJob" into development
Former-commit-id: 4d7125ecc5 [formerly 4d7125ecc5 [formerly 9bd7ddeeb1e850eb1f8729f556fa46d5c70dc342]]
Former-commit-id: 697d0f8853
Former-commit-id: b11c8e5c06
2013-10-16 09:33:25 -05:00
Dave Hladky
8a1f070927 Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

Former-commit-id: 6076f46549 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]
Former-commit-id: 477fbd3d59
Former-commit-id: 639019eff1
2013-10-16 09:06:00 -05:00
Richard Peter
9b83504b42 Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development
Former-commit-id: 9b987e8000 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]
Former-commit-id: e1a0403c01
Former-commit-id: 4c983c7429
2013-10-15 16:36:38 -05:00
Ben Steffensmeier
92828fbaa0 Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38

Former-commit-id: d25df40634 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]
Former-commit-id: 51cd71c373
Former-commit-id: 24a6795677
2013-10-15 16:30:38 -05:00
Nate Jensen
4b2855e7cb Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108

Former-commit-id: 323f594de4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]
Former-commit-id: d265f4ddf4
Former-commit-id: d72a7f3c69
2013-10-15 14:23:59 -05:00
Richard Peter
03a58dabb2 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: cd504e4e98 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]
Former-commit-id: 0787e7cc86
Former-commit-id: 1a62020265
2013-10-15 11:36:12 -05:00
Nate Jensen
4c8eebfb27 Merge "Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins" into development
Former-commit-id: 040918f9a4 [formerly 040918f9a4 [formerly 445f2c0779e98ed7277c8ff95552d062f7b70197]]
Former-commit-id: d7c9a39d16
Former-commit-id: 7256edab5a
2013-10-15 11:21:39 -05:00
Mike Duff
38cd3be19d Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

Former-commit-id: 1485ddd779 [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]
Former-commit-id: a9c8797e9e
Former-commit-id: 7dd6e09fe1
2013-10-15 11:18:52 -05:00
Richard Peter
3ea1646de0 Issue #2389: Update NotificationManagerJob
Change-Id: I3fa926a78a50e9cb6fba7ed98c6560528e3cd7e6

Former-commit-id: 5365515f28 [formerly 5365515f28 [formerly dbf2c35fcae26d261827758318f712641937d989]]
Former-commit-id: f84c7e9607
Former-commit-id: 9da7b5bd5f
2013-10-15 11:07:51 -05:00
Ben Steffensmeier
c84a96a4d9 Issue #2402 Up grib split to 2 threads make it configureable.
Former-commit-id: d644235fe1 [formerly d644235fe1 [formerly f3308c200407bae39175f2620559c6489aa5c788]]
Former-commit-id: 29e77f2e6c
Former-commit-id: 4f7eca694d
2013-10-15 10:59:50 -05:00
Richard Peter
134b78044d Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 48b3816b84 [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: ef49a322f2
2013-10-15 10:49:13 -05:00
Ben Steffensmeier
2b831863c5 Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

Former-commit-id: cfc8bb859f [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]
Former-commit-id: 94560e37c8
Former-commit-id: 2e0698aa06
2013-10-15 10:48:29 -05:00
Nate Jensen
9431adb6f8 Merge "Issue #2386 - Fix for editing subscriptions from subscription manager dlg." into development
Former-commit-id: d1352e9a58 [formerly d1352e9a58 [formerly 0e4624542246e74d9a3a724f9539975da310ca0b]]
Former-commit-id: b6a217cbcb
Former-commit-id: 94457cab3e
2013-10-15 10:26:34 -05:00
Nate Jensen
8ef212412f Issue #2361 remove XML annotations and IDecoderGettable from a variety of plugins
Change-Id: Ib9b09659bbcca9b47c3e185e895d0deb1ba23739

Former-commit-id: 6c2ff04b69 [formerly 6c2ff04b69 [formerly 065be6691bf102699dc7ece3424f6972792c4d6f]]
Former-commit-id: f82364f18e
Former-commit-id: ffe1c83166
2013-10-15 10:08:15 -05:00
Mike Duff
21323fe41c Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682

Former-commit-id: 15fe243ebc [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]
Former-commit-id: 65c693d5c4
Former-commit-id: a49af4489e
2013-10-15 09:52:08 -05:00
Nate Jensen
32c92e9bb8 Issue #2361 fix SCAN Alarm errors
Change-Id: I6c47a38dd3b5c107188fbaabec859448b516bb8b

Former-commit-id: 0f8ecc7c48 [formerly 0f8ecc7c48 [formerly cac9beb945a4edccc5c4304e8d6d02e5ed0fd144]]
Former-commit-id: 9069dc9a0c
Former-commit-id: f8c23ec052
2013-10-15 08:53:12 -05:00
Richard Peter
09abe7175b Merge "Issue #2361 fix build" into development
Former-commit-id: b7db7c0c2c [formerly b7db7c0c2c [formerly 29e94325e3b1dbe949051650091854a152800ac9]]
Former-commit-id: 5173e00254
Former-commit-id: 250d2fcf37
2013-10-14 16:39:44 -05:00
Nate Jensen
711a22eba6 Issue #2361 fix build
Change-Id: I7c93d2be6a04d3414db14e97d0a6a9b2d928ffbd

Former-commit-id: 1e3af0bd1f [formerly 1e3af0bd1f [formerly d90dae07bd4507c96bb60a4ed372f206aeac74a7]]
Former-commit-id: 0adc85a58a
Former-commit-id: aecb906e82
2013-10-14 16:37:52 -05:00
Nate Jensen
926c2ffbd7 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: baac431d85 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]
Former-commit-id: 23e1817385
Former-commit-id: 7cdd1071cf
2013-10-14 16:26:47 -05:00
Richard Peter
270dd63f56 Merge "Issue #2468 compare DataTime without Calendar. Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59" into development
Former-commit-id: 9fa7f87769 [formerly 9fa7f87769 [formerly c45932f98cfeb3b4054b8c632e477c6b344590b7]]
Former-commit-id: 952f7be167
Former-commit-id: e656cf1a4c
2013-10-14 15:43:59 -05:00
Mike Duff
ffbbf04f05 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 33a5d36e1c [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]
Former-commit-id: 83ec4daee2
Former-commit-id: 4764147f67
2013-10-14 15:42:28 -05:00
Ben Steffensmeier
878eba3cda Issue #2468 compare DataTime without Calendar.
Change-Id: I94f5258d04a53ba77c0e0d7af8637d96dd1ecb59

Former-commit-id: 27758e3e7f [formerly 27758e3e7f [formerly c988286b20545bbe7e7dab3d717ebd7f78968048]]
Former-commit-id: 88d9dd4a9d
Former-commit-id: 18b8371f4c
2013-10-14 15:37:25 -05:00
Nate Jensen
b506ef6a8d Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e

Former-commit-id: b49a2ceb2f [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]
Former-commit-id: 40847d0edf
Former-commit-id: 9e4100b0e1
2013-10-14 15:30:09 -05:00
Lee Venable
ad96ec04a4 Issue #2474 - Fixed font memory leak.
Former-commit-id: a9b8c2a2fe [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]
Former-commit-id: f3a9e541a1
Former-commit-id: 36176665ff
2013-10-14 12:42:27 -05:00
Ben Steffensmeier
86dc473dbe Issue #2402 Drop grib split to one thread, remove LargeGribFile from ISerializeableObject file.
Former-commit-id: cb37bc8e38 [formerly cb37bc8e38 [formerly 0b0476bf4df65366fb4bfe8cbead30dde1620054]]
Former-commit-id: afe18f40e6
Former-commit-id: 66d74b3884
2013-10-14 11:46:57 -05:00
Nate Jensen
3bbebda385 Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: abf2fa50b7 [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 85af27444f
2013-10-14 11:42:23 -05:00
Nate Jensen
72a5e48967 Merge "Issue #2333 Removed more unused fields from satellite record" into development
Former-commit-id: 01b534fc5a [formerly 01b534fc5a [formerly 49ba8c831ec6318b82d66372c8370b97070733dd]]
Former-commit-id: b9cf1a6533
Former-commit-id: 480acfddfb
2013-10-14 11:41:45 -05:00
Richard Peter
70ed87f63e Merge "Issue #2402 Remove excessive grid point count output." into development
Former-commit-id: 8466d69993 [formerly 8466d69993 [formerly ef68e9c3459e1e1cf40b433e05e0c6beea5f18e0]]
Former-commit-id: ac61eedd88
Former-commit-id: 3af222d8da
2013-10-14 11:16:03 -05:00
Richard Peter
f4de754699 Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: d8b49516dc [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]
Former-commit-id: c056c93104
Former-commit-id: eb1ed4cda6
2013-10-14 11:15:40 -05:00
Ben Steffensmeier
f8e1ac1db5 Issue #2402 Remove excessive grid point count output.
Former-commit-id: a42c0654f5 [formerly a42c0654f5 [formerly 4c25d75411a8c28cc2a2511c8d3a4876eaaa7be4]]
Former-commit-id: f290019e64
Former-commit-id: 18e33cba9d
2013-10-14 11:13:03 -05:00
Steve Harris
714ebfb6d0 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: 852c02c848 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]
Former-commit-id: 545d7ca463
Former-commit-id: 5cf3cc1efc
2013-10-14 09:28:24 -05:00
Greg Armendariz
0d62d1886c Merge "Issue #2297 - fix 14.2.1 qpid build" into development
Former-commit-id: aa0d3bdab4 [formerly aa0d3bdab4 [formerly 6a11a118261a0cbad93933d99d6a89187c831a02]]
Former-commit-id: 01a1ada89b
Former-commit-id: 0d066c50cd
2013-10-14 09:08:05 -05:00
Steve Harris
b74898370f 13.5.2-10 baseline
Former-commit-id: 46c351de6c [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 5f86804c81
2013-10-14 09:59:31 -04:00
Mike Duff
eaa8e67afd Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments

Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf

Former-commit-id: a220ff05b0 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]
Former-commit-id: a69120c623
Former-commit-id: f9074dc896
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
a129474a80 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: 89eb327bf0 [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]
Former-commit-id: c5d49b2a4c
Former-commit-id: c38c7d654c
2013-10-11 16:25:28 -05:00
Max Schenkelberg
67491d2af0 Issue #2333 Removed more unused fields from satellite record
Change-Id: I02ec3ff328606673d717c31e583c2679389e87ec

Former-commit-id: b68b8de21b [formerly b68b8de21b [formerly 91c5da670e6b23814532b473c93237744398369d]]
Former-commit-id: 8fddd5a57b
Former-commit-id: 3b53d18be4
2013-10-11 16:17:52 -05:00
Richard Peter
14df7cc0c1 Merge "Issue #2402 Make grib large grid handling more dynamic. Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d" into development
Former-commit-id: a99e286c0f [formerly a99e286c0f [formerly f0ab566352660170b71b46f6517e371d42f973df]]
Former-commit-id: dba525c5e6
Former-commit-id: 2d1963c665
2013-10-11 15:34:31 -05:00
Nate Jensen
327bb053af 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: 88f83a842e [formerly 88f83a842e [formerly 2de15863597a3fc86ff11415de9c1bbec26b12e8]]
Former-commit-id: 1b2024a69d
Former-commit-id: e5b854964d
2013-10-11 15:33:42 -05:00
Ben Steffensmeier
3f554d680f Issue #2402 Make grib large grid handling more dynamic.
Change-Id: I463f57ac5ccbef2773ee299f36fa808c62d7da2d

Former-commit-id: 3fd473e25d [formerly 3fd473e25d [formerly bec1391240d3bf2ac0da4e8b29ae6ce3985e3d32]]
Former-commit-id: 0ecab8d44e
Former-commit-id: 78b278e4ef
2013-10-11 15:22:32 -05:00
Max Schenkelberg
e8be0b3728 Issue #2081 Fixed null pointer in DataURIUtil
Change-Id: Ic052c0d12e51949568bb5540ab97b1e0091ca231

Former-commit-id: 819df41147 [formerly 819df41147 [formerly ab9174cac744785588c49237fde5cb497fb09d0f]]
Former-commit-id: 67bfa28850
Former-commit-id: 50fd97a5d5
2013-10-11 14:29:11 -05:00
Lee Venable
34b2bbc487 Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 3b98dc699c [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]
Former-commit-id: 06a38bd123
Former-commit-id: 82556ab7ec
2013-10-11 13:02:35 -05:00
Max Schenkelberg
239d0e52ea 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: fbc06d81f7 [formerly fbc06d81f7 [formerly 2957c9c40fe85cbe5bd90c5f6444fce1f9ffdcf1]]
Former-commit-id: 41b6f79c52
Former-commit-id: dd99767050
2013-10-11 12:14:21 -05:00
Nate Jensen
184d23719b 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: 8208d756c7 [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]
Former-commit-id: d5d0fab53b
Former-commit-id: a34777a738
2013-10-11 11:21:18 -05:00
Lee Venable
7335826e3f Issue #2471 - fixed color memory leak.
Former-commit-id: bceb4d76bf [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]
Former-commit-id: 61e5d5e4da
Former-commit-id: 107b35761b
2013-10-11 11:09:57 -05:00
Brad Gonzales
32dce367a9 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: 25710edd9e [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]
Former-commit-id: bc87f2a168
Former-commit-id: 897fdfc2f6
2013-10-11 10:36:53 -05:00
Max Schenkelberg
3c2f370688 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: 7a66a3c995 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]
Former-commit-id: 01c0e022d5
Former-commit-id: cf0ad44ee3
2013-10-11 10:21:37 -05:00
Ron Anderson
5b87108b39 Merge "Issue #2361 fix iscUtil" into development
Former-commit-id: 3e260a58d9 [formerly 3e260a58d9 [formerly 52834c2c4a82218588f2725c3ea12c4ce8e3dc14]]
Former-commit-id: 584a782545
Former-commit-id: d13c6943da
2013-10-10 18:03:36 -05:00
Nate Jensen
4abdb19dc4 Merge "Issue #2376 Fix STI parsing Change-Id: Ifcf0829f187a2fb96258cb3706e52bb1ba725fe5" into development
Former-commit-id: baac824e68 [formerly baac824e68 [formerly dfe0380de11634362922e9194e7a2f7e915a1445]]
Former-commit-id: 3dbf65f001
Former-commit-id: 117fd8377a
2013-10-10 17:38:22 -05:00
Nate Jensen
d9573cb7ca Issue #2361 fix iscUtil
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28

Former-commit-id: 8aecb21306 [formerly 8aecb21306 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]
Former-commit-id: dc60f94a34
Former-commit-id: ef92804824
2013-10-10 17:38:01 -05:00