Commit graph

2426 commits

Author SHA1 Message Date
Nate Jensen
fa1bd6b2a4 Merge "Issue #2484 Added originatingSite to id for Subscription registry objects." into development
Former-commit-id: 9e65845da0 [formerly 13eafc05c2] [formerly 4b19d287ea] [formerly e4aa2b8a94 [formerly 4b19d287ea [formerly 4b16e5325f63bb7dde3d5a49770fd4c30b69266b]]]
Former-commit-id: e4aa2b8a94
Former-commit-id: ca27ae050bf35e88c84ec39cb3554276213a3fe7 [formerly aa0e2ca80a]
Former-commit-id: 8aa02150c4
2013-10-28 09:07:04 -05:00
Nate Jensen
a2bf6fb3fb Merge "Issue #2491 Remove uneeded ISerializableObject files." into development
Former-commit-id: fe6680fb56 [formerly f98764cfb6] [formerly 5840b34e67] [formerly 15fbcd6984 [formerly 5840b34e67 [formerly 9d43ad381967fff847f33025461a31bb31816819]]]
Former-commit-id: 15fbcd6984
Former-commit-id: a46bb24ed422dbd3fd41b66e023bd7c2d4fc36e7 [formerly 68a8dbe064]
Former-commit-id: e46c285eed
2013-10-28 09:05:01 -05:00
Ben Steffensmeier
694511af94 Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.
Former-commit-id: e796e01586 [formerly 3b68ce8d72] [formerly 2a83b45f93] [formerly 4c03fc93f1 [formerly 2a83b45f93 [formerly f74c39d591d10748f7e66c15c80390389ab5ec25]]]
Former-commit-id: 4c03fc93f1
Former-commit-id: ea40a4ab707d0769a72c89593d2b1a20c48d84a7 [formerly fbdcadb456]
Former-commit-id: 4eea088717
2013-10-25 15:50:10 -05:00
Ben Steffensmeier
13829ffd04 Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly de02c88451a8ddfee21be1432313918cb2a173ac [formerly 88ad284e71]] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]
Former-commit-id: 237d947086
2013-10-25 15:42:53 -05:00
Ben Steffensmeier
e03a1c1202 Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: 230309c25f [formerly f34bfc1e5b] [formerly c14cc609a8] [formerly cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]]
Former-commit-id: cac1f07cbb
Former-commit-id: cbb9e5689b5ecaf7c5b0202dbf3d51fae0c0dda9 [formerly a06bdc56d6]
Former-commit-id: ce9653ab15
2013-10-25 15:31:39 -05:00
Ben Steffensmeier
ed7e75b748 Issue #2491 fix d2d xy bundles.
Former-commit-id: bb59c04696 [formerly 9922b11f75] [formerly 5b6e32f47e] [formerly 86ba5b9f09 [formerly 5b6e32f47e [formerly 4f41b90c20e25689a24d73bdd92e24952516199a]]]
Former-commit-id: 86ba5b9f09
Former-commit-id: abfcb4c0128db0fe3c621473959c887bb4552882 [formerly ddf45e1cf4]
Former-commit-id: 8248ea2b3b
2013-10-25 14:46:43 -05:00
Steve Harris
2e6e031198 13.5.2-12 baseline
Former-commit-id: 845d49e370 [formerly e2b9baf2ed] [formerly a532896473] [formerly bcb531e671 [formerly a532896473 [formerly 7918a1bb18c212f8a3b84edec932880126d351be]]]
Former-commit-id: bcb531e671
Former-commit-id: 7b3329db475d8a4c9b900f448656bc46192af5e3 [formerly b70ec5732d]
Former-commit-id: 15d9848170
2013-10-25 09:59:15 -04:00
Steve Harris
a18eb8fe83 13.5.2-11 baseline
Former-commit-id: e67aaa07b7 [formerly 9215a213a1] [formerly b820a28276] [formerly cbfde2f52a [formerly b820a28276 [formerly de1a605c7e59fea76f937d328a68c15209ab5b06]]]
Former-commit-id: cbfde2f52a
Former-commit-id: 65bc8a903da70f57f90d438452f29a0d3d26bc2a [formerly c1473d8a72]
Former-commit-id: ecad06c80d
2013-10-25 09:45:58 -04:00
Nate Jensen
264555b5d7 Merge "Issue #2491 Use reflections to build Procedure JAXB context. Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b" into development
Former-commit-id: 2c88b7d9b3 [formerly 3a453d5442] [formerly 002005139f] [formerly 5a99163569 [formerly 002005139f [formerly 16f9a9ece5743e0e1f2cd71b23287defb277e915]]]
Former-commit-id: 5a99163569
Former-commit-id: 4719aa1e26e1f8f1e10b15401b23c42814a2069f [formerly cf63b37257]
Former-commit-id: b511177fa1
2013-10-24 20:02:18 -05:00
Nate Jensen
e6e0942d70 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 b1244552e4 [formerly b17fc59a5a [formerly 757ee730af2455ac88f2b5a666e23d32e3e068ef]]]
Former-commit-id: b1244552e4
Former-commit-id: 7e842a91bf165a8db2e89fabd3906c256ec6db0e [formerly 803c9a8217]
Former-commit-id: 3a1856b168
2013-10-24 19:52:13 -05:00
Dave Hladky
e44f20606e Issue #2484 Added originatingSite to id for Subscription registry objects.
Former-commit-id: 68002da957 [formerly 577e2b84e9] [formerly 3c33f6e5ea] [formerly 36d7c60914 [formerly 3c33f6e5ea [formerly f3bd999abcbed2cfb78ebd88604fbe3128e6de34]]]
Former-commit-id: 36d7c60914
Former-commit-id: 84058224c1b44f8002df97e875e14dd66e8446ce [formerly 2b5ffeab74]
Former-commit-id: db33e9cafa
2013-10-24 13:52:45 -05:00
Ben Steffensmeier
3b4ae67ded Issue #2491 Use reflections to build Procedure JAXB context.
Change-Id: I7fa43fc4d89109cf5b8f5e111c8f98a086c6c03b

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

Former-commit-id: 68ef7c7062 [formerly 680ba97826] [formerly 002bb6ab89] [formerly cc28fca175 [formerly 002bb6ab89 [formerly 57d68b507b69ef4a72ceecaa20a9dce3c0d93de3]]]
Former-commit-id: cc28fca175
Former-commit-id: 4b9ce7666378daf235ca6c2275644a5d5cc7407a [formerly 20fcbd322e]
Former-commit-id: 0d9df14596
2013-10-23 16:02:40 -05:00
Nate Jensen
d2af0d52a6 Issue #2361 remove dependencies on mesowest and delete dead grichardson code
Former-commit-id: bd9578dd6d [formerly 65d7d4dac9] [formerly 477c64c8bd] [formerly 2f79b34a77 [formerly 477c64c8bd [formerly a91a4fe2261050daee83b1edaa7d01404b7b89a0]]]
Former-commit-id: 2f79b34a77
Former-commit-id: a01d69eb125667dc0511591658732e612649a73e [formerly 1adac8829f]
Former-commit-id: 2419a99ac7
2013-10-23 14:52:29 -05:00
Brad Gonzales
a6b82470eb 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 e3883dba15 [formerly 60d7a13afd [formerly 3abca4ca950facaaa5a29cf2aaa6fccdcf469e95]]]
Former-commit-id: e3883dba15
Former-commit-id: 626bc6ac4ce722cbc6c9e2cd43b6ed575ca56112 [formerly b8cd1d5446]
Former-commit-id: 086dfe9ebc
2013-10-23 14:13:03 -05:00
Lee Venable
0d399cc52a Issue #2483 - Fixed image memory leak.
Former-commit-id: 1a52e2b388 [formerly 73caae724c] [formerly a2f75e547d] [formerly 3d6547d644 [formerly a2f75e547d [formerly b590a1d5799a94068fe9e444e40bb3819d596071]]]
Former-commit-id: 3d6547d644
Former-commit-id: 3d39b70d995dcfb7c2529bb9b72c3ce4df1b010c [formerly 74603afd97]
Former-commit-id: 25c7bd679f
2013-10-23 08:26:49 -05:00
Nate Jensen
223337178c Merge "Issue #2361 undo loading maps at startup" into development
Former-commit-id: d936dc839d [formerly 0e5ea7744e] [formerly ced02a508a] [formerly 88ca2a78de [formerly ced02a508a [formerly 9e3b9ba67aafbcb0bfe7de147d00c44aa37403ac]]]
Former-commit-id: 88ca2a78de
Former-commit-id: a55807d37bbef25e8d8929bb33fd3ccf74c0257c [formerly 173e28b9d9]
Former-commit-id: 250f553532
2013-10-22 13:05:22 -05:00
Nate Jensen
9a6f474b0b Issue #2361 undo loading maps at startup
Change-Id: If737fe16df0b11dbb2dd510697cba2ffaa5967a4

Former-commit-id: 4879e1d7d3 [formerly e65d392677] [formerly 5e2ebbaad8] [formerly 938e4a3073 [formerly 5e2ebbaad8 [formerly 15c1452f6970515d91b5bcc0c75de1679f561c87]]]
Former-commit-id: 938e4a3073
Former-commit-id: 7b549b23c7a05b00918c0b4e70c2fde2005dabc1 [formerly d1ff15485c]
Former-commit-id: 621eaab03a
2013-10-22 12:42:41 -05:00
Slav Korolev
d56f7ca3a9 Issue #2455. Fixed error from test.
Former-commit-id: 34300d63a1 [formerly f64d667715] [formerly 359c281b1e] [formerly 981544290e [formerly 359c281b1e [formerly 86967352eba1893eb4ec40187638bfc33d06cc21]]]
Former-commit-id: 981544290e
Former-commit-id: 90582b33ceb3e84ea08f1c20ad1a3bd68ef28ea6 [formerly 263244b606]
Former-commit-id: d0aa6f6f26
2013-10-22 12:34:34 -04:00
Nate Jensen
b1a5a615f3 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 aa0554d073 [formerly 50bf735240 [formerly 41462b804bf079368bead7c1271b1abdb7d4bf63]]]
Former-commit-id: aa0554d073
Former-commit-id: ae45b51290b85ce8a744919e605659b1f78cc2cc [formerly d8a821746c]
Former-commit-id: a58f2a6c10
2013-10-21 14:44:17 -05:00
Slav Korolev
da1acc7fff Issue #2451. Get highlighted rows on the table page after message update. Corrected.
Former-commit-id: 3eb5ae69c0 [formerly 981a44ffe9] [formerly d0d4f12057] [formerly a7883aabd3 [formerly d0d4f12057 [formerly 652094eb318459b1b73924ebba2b542b5f97eaff]]]
Former-commit-id: a7883aabd3
Former-commit-id: 08093b85ce58869330a7d6751c6f0a99e4322a03 [formerly 1d5a028ee1]
Former-commit-id: d5315c8f57
2013-10-17 16:39:26 -04:00
Nate Jensen
9dd39289ef Merge "Issue #2361 fix scan alarm dialog" into development
Former-commit-id: b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 3a8650ef28 [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: f2c56097835e64f08a5d48331e7d3b30ef221a5d [formerly 64fdaa70d7]
Former-commit-id: 32ecd61eae
2013-10-17 14:20:52 -05:00
Nate Jensen
ca63e8a2ee Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426

Former-commit-id: 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 81fd87d9dd [formerly 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]]]
Former-commit-id: 81fd87d9dd
Former-commit-id: 3d0e510f23ea361cf143bfcee0bba966812d2c43 [formerly 4cd95b545b]
Former-commit-id: de55e62614
2013-10-17 13:55:19 -05:00
Slav Korolev
80b0798d4f Issue #2455. Fixed a problem with Changes Applied window. Corrected.
Former-commit-id: ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly 4100629b39 [formerly 93b69bd6a7 [formerly c07a918474361d83907fb8de03538ec88486016d]]]
Former-commit-id: 4100629b39
Former-commit-id: 9cc2d94fd6c5402787966d92170a9231e42ba36d [formerly 552789c978]
Former-commit-id: b3ec990f41
2013-10-17 14:17:11 -04:00
Max Schenkelberg
af48a7e839 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 004720f7a9 [formerly 676493c6e2 [formerly b4249acf8655c2c31e491cf945f2bb4fc00f7fad]]]
Former-commit-id: 004720f7a9
Former-commit-id: 28d6f1e7606f37b873f1fed4610372d4a7014d7e [formerly 872652cab9]
Former-commit-id: df3b18d237
2013-10-17 12:59:23 -05:00
Nate Jensen
5637ba654f Merge "Issue #2460 Product browser display of adhoc subscriptions Change-Id: I9c045b781adb41468d395b67a837c9a862744447" into development
Former-commit-id: 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly c8633d47cf [formerly 8ef0c6e84e [formerly 261a4f821cf2276849f3aab67f407147448ed979]]]
Former-commit-id: c8633d47cf
Former-commit-id: 3e0d80ff1a8f1fa9f0d4d551118a63138ae2a7e7 [formerly 268da5555e]
Former-commit-id: 1ca5f5fb4c
2013-10-16 15:14:42 -05:00
Nate Jensen
128de383e2 Merge "Issue #2389: Update NotificationManagerJob" into development
Former-commit-id: 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 697d0f8853 [formerly 4d7125ecc5 [formerly 9bd7ddeeb1e850eb1f8729f556fa46d5c70dc342]]]
Former-commit-id: 697d0f8853
Former-commit-id: fa6ee5f1dc33049e03880939e3155710f83ede24 [formerly b11c8e5c06]
Former-commit-id: 8f9ca27d50
2013-10-16 09:33:25 -05:00
Dave Hladky
aa5fd1ba3f Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447

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

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

Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]
Former-commit-id: 521c019757
2013-10-15 14:23:59 -05:00
Richard Peter
210927720b 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 9264b9c5559b76abd686cb8133cdc03e7ea2acc7 [formerly cd504e4e98]] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]
Former-commit-id: 9896b051c1
2013-10-15 11:36:12 -05:00
Mike Duff
5933d330b9 Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c

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

Former-commit-id: 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly f84c7e9607 [formerly 5365515f28 [formerly dbf2c35fcae26d261827758318f712641937d989]]]
Former-commit-id: f84c7e9607
Former-commit-id: 924a10958d9381d9077f1691ced1188d3bbab299 [formerly 9da7b5bd5f]
Former-commit-id: 1a999c52c2
2013-10-15 11:07:51 -05:00
Richard Peter
aef98d5342 Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]
Former-commit-id: 60e49cf211
2013-10-15 10:49:13 -05:00
Ben Steffensmeier
253ada50d5 Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23

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

Former-commit-id: e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]]
Former-commit-id: 65c693d5c4
Former-commit-id: b2ab42e078ad49f585ba986c8d78ecffb7953af6 [formerly a49af4489e]
Former-commit-id: 7bcffa5275
2013-10-15 09:52:08 -05:00
Nate Jensen
95f1de78e5 Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]
Former-commit-id: 23e1817385
Former-commit-id: f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]
Former-commit-id: eabc32a720
2013-10-14 16:26:47 -05:00
Mike Duff
5913f21dd6 Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f

Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]
Former-commit-id: c4e3b900c9
2013-10-14 15:42:28 -05:00
Nate Jensen
9d1df167be 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 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]
Former-commit-id: 40847d0edf
Former-commit-id: 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]
Former-commit-id: d84f47b609
2013-10-14 15:30:09 -05:00
Lee Venable
bdbbcbb36a Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]
Former-commit-id: f3a9e541a1
Former-commit-id: 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]
Former-commit-id: 87e40ae6b1
2013-10-14 12:42:27 -05:00
Nate Jensen
0059665def Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly 96463c6117296ffe71df938350471c29d4b82158 [formerly abf2fa50b7]] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]
Former-commit-id: 48445dd8cf
2013-10-14 11:42:23 -05:00
Richard Peter
6a0020cf1c 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 c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]
Former-commit-id: c056c93104
Former-commit-id: 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]
Former-commit-id: b6d6458ab2
2013-10-14 11:15:40 -05:00
Steve Harris
cc5e19f181 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 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]
Former-commit-id: 545d7ca463
Former-commit-id: 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]
Former-commit-id: 2f0968a279
2013-10-14 09:28:24 -05:00
Steve Harris
99dac05b85 13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]
Former-commit-id: d1f38eb936
2013-10-14 09:59:31 -04:00
Mike Duff
27fd5ba0fa 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 a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]
Former-commit-id: a69120c623
Former-commit-id: 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]
Former-commit-id: 610c937a00
2013-10-11 18:18:18 -05:00
Ben Steffensmeier
44613a0c61 Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]
Former-commit-id: ae94d39ce2
2013-10-11 16:25:28 -05:00
Lee Venable
ca1a404c58 Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]
Former-commit-id: 06a38bd123
Former-commit-id: 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]
Former-commit-id: 3e95f8feb8
2013-10-11 13:02:35 -05:00
Nate Jensen
d3e361eaa4 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 d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]
Former-commit-id: d5d0fab53b
Former-commit-id: bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]
Former-commit-id: fd3a19a73c
2013-10-11 11:21:18 -05:00