Commit graph

155 commits

Author SHA1 Message Date
Nate Jensen
8778e9f945 Merge "Issue #1638 fix velocity on windows" into development
Former-commit-id: 33b73b008f [formerly 37d996c64c] [formerly 4486bd9941] [formerly 676b3c9d11 [formerly 4486bd9941 [formerly c9c5818d5c1002d3ebb6deef591fd80b2ce32c7c]]]
Former-commit-id: 676b3c9d11
Former-commit-id: 6bbc851111461bca4aabeb7be09dfa13233066b8 [formerly 33f185d021]
Former-commit-id: a4a5a1e94f
2013-03-12 16:43:13 -05:00
Nate Jensen
f4b80d4b15 Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 48170212cb [formerly 5e545cc9c4] [formerly 863d4cf3df] [formerly cbf0343d72 [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]]
Former-commit-id: cbf0343d72
Former-commit-id: 86f6a376c5bb355801995427243a8f6c4288aac8 [formerly b00ccd2b77]
Former-commit-id: 35d0187e3d
2013-03-12 16:04:59 -05:00
Steve Harris
47cde9bd09 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]
Former-commit-id: bca46a1354
2013-03-12 16:04:23 -05:00
Nate Jensen
97172b7466 Issue #1753 log on user shutdown
Change-Id: Iff63204ed84809111215588ead2b6447e1b2a549

Former-commit-id: 2a34c5757a [formerly f101934a30] [formerly a7e9cfdb39] [formerly 163f93019b [formerly a7e9cfdb39 [formerly f8d4ec45dffcb6c969c2bb94cd924412b0caa308]]]
Former-commit-id: 163f93019b
Former-commit-id: 8af3fb81542f03f05402208a65fd3f1ea9cb1229 [formerly d6c3c84d30]
Former-commit-id: c4175c161f
2013-03-06 09:36:00 -06:00
Ben Steffensmeier
4936191404 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]
Former-commit-id: 334af0001b
2013-02-28 17:00:56 -06:00
Max Schenkelberg
2aef608c3f Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: d0b7850775 [formerly 2611980ca4] [formerly 4ed4ef8d71] [formerly e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]]
Former-commit-id: e0ba97d547
Former-commit-id: c22d83de78a7efcb6e70f98b882e95d6a6e64ae6 [formerly 6b1426dd34]
Former-commit-id: 5617dfaa67
2013-02-27 11:50:38 -06:00
Ron Anderson
dc8d1dd95c Issue #1597 Code cleanup and logging improvement for GFE Performance metrics
Change-Id: Ib4d92b3c5a270e28a75beb5fbb5cf56557165765

Former-commit-id: 547f0d086f [formerly d43afc8c67] [formerly bfe3c684df] [formerly f37999b1eb [formerly bfe3c684df [formerly 0b4b49014598aeb94492d0b713afe17732c6e029]]]
Former-commit-id: f37999b1eb
Former-commit-id: bf9a2b39ec50125619129c86673eb152b84b87e6 [formerly 77fbbb6a61]
Former-commit-id: 541557e0b0
2013-02-26 18:44:51 -06:00
Roger Ferrel
82804ac8bb Issue #1442 Fix null pointer exception in DecisonTree's searchTree
Change-Id: I5bf36da8aa6e8ef2a2efee08e01e232bff8eb7ef

Former-commit-id: 4337d23872 [formerly 07a103c3bb] [formerly 152715160e] [formerly 09b5996dac [formerly 152715160e [formerly 9ef63af71325c5b6694f41c78506d618078e0b9e]]]
Former-commit-id: 09b5996dac
Former-commit-id: 3f8334cdb8bbe5133624435d74cf48b95e4f2493 [formerly fd95a99596]
Former-commit-id: 186c71e5ac
2013-02-22 12:49:53 -06:00
Ron Anderson
c0364ee665 Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]
Former-commit-id: 884d9ff787
Former-commit-id: 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]
Former-commit-id: 744391e3f6
2013-02-19 18:46:16 -06:00
Mike Duff
6628aea419 Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 5331d05c64 [formerly 897262630c] [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 0b044dba9c [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 269babb3d811c862c91f7c6f2b44a05605b7552e [formerly 079ec4b6dd]
Former-commit-id: 3e59308771
2013-02-18 08:16:57 -06:00
Ben Steffensmeier
4140260659 Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default.
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]
Former-commit-id: 086f6aabe9
2013-02-14 15:34:25 -06:00
Nate Jensen
86f216d855 Issue #1526 refactor for clarity and to stream responses from pypies
Change-Id: Ia07aca01a528b51de4fd20571edaa90cc06631d7

Former-commit-id: 3e3c419ff3 [formerly 56112143c3] [formerly 96232ab0ab] [formerly 92076242fc [formerly 96232ab0ab [formerly 26ba8a930a723ccbecdc09d873cbcb917e8b453e]]]
Former-commit-id: 92076242fc
Former-commit-id: 7461b87c7c8671c256729eaacaf9ad90552f18f9 [formerly cbca34e709]
Former-commit-id: 54cea219cf
2013-02-12 16:33:01 -06:00
Richard Peter
0ae1b55321 Merge "Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed" into development
Former-commit-id: de8c595a0e [formerly 59ef7758f1] [formerly 6eb11703e4] [formerly 2946e97294 [formerly 6eb11703e4 [formerly 86019df71625be675e8bfce21877fa2e40b2b23c]]]
Former-commit-id: 2946e97294
Former-commit-id: 111af45a80d6a0af8bd6a302b734f70ab8d8f912 [formerly 878cbe1695]
Former-commit-id: 7c9b9b0237
2013-01-28 15:27:23 -06:00
Steve Harris
1397f8a811 Merge branch '13.2.1_delivery' into development
Former-commit-id: d6aeabad12 [formerly 618cf868c5] [formerly f673583915] [formerly 827611474f [formerly f673583915 [formerly 5c6a08af0ad5f6185645e53143bf88d8c27f10d0]]]
Former-commit-id: 827611474f
Former-commit-id: b9760adfb36650f58aa4202fbbd5beedb40f8529 [formerly 25fecb8b4f]
Former-commit-id: a85c81289e
2013-01-25 10:54:51 -06:00
Nate Jensen
9fb144f73e Issue #1526 stream cave to edex http requests and responses direct through DynamicSerialize to reduce memory usage and boost speed
Change-Id: I9156f9b29f3e57a668791da28b692420a27dfa96

Former-commit-id: add78bd445 [formerly c7172e87a3] [formerly 705bfb0755] [formerly 2dc3abb847 [formerly 705bfb0755 [formerly 505fa329c6700063aec6b62e4fef623b539ad801]]]
Former-commit-id: 2dc3abb847
Former-commit-id: 7e4143b4d4e1d3ad304dded5581543897cc27dd0 [formerly fa27552c9b]
Former-commit-id: 04a397866a
2013-01-24 16:41:02 -06:00
Max Schenkelberg
c709c91154 Issue #1474 Fixed MetarPrecipResourceData and LightningResourceData so updates do not required requery. Made an AutoUpdater per plugin so they process independently of each other.
Amend: Only register product alerts in thin client if JMS is not disabled

Change-Id: Ic46daf57ef3ede3aad2a2f067e9764f85f7df9a2

Former-commit-id: 73fbdc6da3 [formerly a8dc166a1f] [formerly 9655d64069] [formerly b6a29c38a5 [formerly 9655d64069 [formerly 115dc26748e0779b4c67cc74fe08c5bf17542632]]]
Former-commit-id: b6a29c38a5
Former-commit-id: 52f3bdc976aa7b28a5a0097fdc6d4d6c63530fb5 [formerly 11c8dd6fff]
Former-commit-id: ecce9be8ce
2013-01-23 16:50:17 -06:00
Steve Harris
b33edc1373 Merge branch '13.2.1_delivery' into development
Former-commit-id: 0a728f6550 [formerly cbffccc58e] [formerly 1718a19f2d] [formerly 9b6cc68601 [formerly 1718a19f2d [formerly 382363c3418b73ecd4f0ead96315a50fe859f779]]]
Former-commit-id: 9b6cc68601
Former-commit-id: 85fb1ad709c9c553a8e608e531581ff213d0b779 [formerly c7148da94d]
Former-commit-id: 764efdb8b8
2013-01-22 21:47:09 -06:00
Max Schenkelberg
004f5213e1 Issue #1485 fixed bug in CAVE localization where a save() operation would appear to work when it actually failed due to user not being authorized.
Change-Id: Ib37e5be2163d750ac24827c2868162b06c290390

Former-commit-id: 1944f4f81d [formerly 8058260830] [formerly 5c51083f35] [formerly 6fd6b2e42d [formerly 5c51083f35 [formerly 3b5af8689a2fc2a7ee783d896c624fbc5581b58a]]]
Former-commit-id: 6fd6b2e42d
Former-commit-id: 79bd5d81a31d638d24e6343dd5e7a7bedd4ae7c3 [formerly 2c05f3c179]
Former-commit-id: 3d459dd57c
2013-01-21 14:58:16 -06:00
Ben Steffensmeier
d270c16979 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 3802dad955 [formerly a9654f859a] [formerly f0af056d97] [formerly ec199ad7d1 [formerly f0af056d97 [formerly deeff9eae06f096612b65832a344e5d05a36db07]]]
Former-commit-id: ec199ad7d1
Former-commit-id: 08da3e13f0dfa4e1eab04881e0b72815afc9b88a [formerly 3bfba5b771]
Former-commit-id: 50d1561165
2013-01-18 10:59:43 -06:00
Roger Ferrel
96deac5f43 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]
Former-commit-id: 86d51634dc
2013-01-16 16:53:29 -06:00
Steve Harris
bda3371aef Merge branch '13.2.1_delivery' into development
Former-commit-id: e87c1739ce [formerly 79e7b50d94] [formerly 8c447659ff] [formerly 483e55bcef [formerly 8c447659ff [formerly 723f0efba18c83c46d3b241dae678e81d2ac924d]]]
Former-commit-id: 483e55bcef
Former-commit-id: 1f1108e1b07236a5416fa8b9d145b56652782043 [formerly 2e34a82690]
Former-commit-id: b8ab464cee
2013-01-16 12:03:50 -06:00
Bryan Kowal
49b121ed3a Issue #1469 - pypies will now read the hdf5 root directory from configuration. Relative paths can now be passed to pypies. Rebased to fix merge conflict.
Change-Id: I38873e478729a3644db7ce2813e9bd6c15d9bdf3

Former-commit-id: 1414f0415b [formerly fba28ea69b] [formerly 300e157b3c8dfc3a1f2f1580d6046fcedc74aed2 [formerly e2a12845d3]] [formerly 4db9c6c321 [formerly e2a12845d3 [formerly ed2e78738b391bcb9a40ddde7b7a6acf7ccd1b30]]]
Former-commit-id: 4db9c6c321
Former-commit-id: 59073a26adad34d6d9a1d72d03facd04de433ad2 [formerly c1330e8121]
Former-commit-id: 38480e46b1
2013-01-15 14:56:01 -06:00
Lee Venable
e5e1841b7e Merge "Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates." into development
Former-commit-id: 1578950906 [formerly a3c5aded12] [formerly 32692a6def] [formerly f63da5aba6 [formerly 32692a6def [formerly 517b6e6652b75801928cbb8f2f6899916e8dd988]]]
Former-commit-id: f63da5aba6
Former-commit-id: 2d8f8827471d802ee24a1d297aac5aed42839e14 [formerly 5a733e465d]
Former-commit-id: c4291fcb2a
2013-01-15 14:47:49 -06:00
Max Schenkelberg
cea378c445 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously.
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: f51398595e [formerly 9aac1d2871] [formerly 02e7c79de9] [formerly aa88b83859 [formerly 02e7c79de9 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]]
Former-commit-id: aa88b83859
Former-commit-id: 451ec6f6d7261a1c251d7e39253fc41e3af7c367 [formerly c6b6823228]
Former-commit-id: 410abb1144
2013-01-15 14:13:36 -06:00
Ben Steffensmeier
2ebe93dc12 Issue #1483 switch dual pol bundles to no longer use bestRes, fix bestRes updates.
Former-commit-id: 1926965b6b [formerly da79be73a2] [formerly f49e77f7df] [formerly 2e10a8408b [formerly f49e77f7df [formerly c0888b1ff6de67da8b4bb7a234bc5dbecafa9009]]]
Former-commit-id: 2e10a8408b
Former-commit-id: 2adb2b2db42f9a0a161c689d6a3b7ec66791bb64 [formerly 0a0d230091]
Former-commit-id: 3d63fa24a1
2013-01-14 17:44:46 -06:00
Ben Steffensmeier
dea702c873 Issue #1480 guarantee that framesInfo returned from descriptor is always valid.
Former-commit-id: 4547887fe6 [formerly e00348a124] [formerly cf8a9e3f64] [formerly ac9ba67919 [formerly cf8a9e3f64 [formerly c2b715458167c4438d2c2c35b3b0cb54c2a9cc9c]]]
Former-commit-id: ac9ba67919
Former-commit-id: c92b1fa2bb66c18a0319bba6df102f7c8450428d [formerly 147a379a81]
Former-commit-id: c1ae999c81
2013-01-14 14:30:17 -06:00
Ben Steffensmeier
3f17e60975 Issue #1470 remove times from grid resources when updates arrive.
Former-commit-id: b210023c96 [formerly 6e7b5a0e3d] [formerly 211a9b6cee] [formerly a1afabe4e3 [formerly 211a9b6cee [formerly 355bd4c62d4f56064341930145ad2a29cb807eed]]]
Former-commit-id: a1afabe4e3
Former-commit-id: b4a7ccd68b59466072f1a849836b8ea6dc674c1c [formerly 7b6bc3f69b]
Former-commit-id: 3b72ea7f19
2013-01-11 11:46:32 -06:00
Ron Anderson
1b4acc66e9 Issue #1395 Fixed dynamic update of opacity.
Change-Id: Ic552a759c23035dfe2d830323d4dbe170e0d0187

Former-commit-id: 7b8eba7461 [formerly 37d6ed5232] [formerly 145665c496] [formerly 3df3cf7f7b [formerly 145665c496 [formerly cae505a088e959670f4cacb92e439a82f13559b9]]]
Former-commit-id: 3df3cf7f7b
Former-commit-id: 394db5ca0b53e186b2f8d6e2619a70bcb1da53e8 [formerly 1f298b87b5]
Former-commit-id: 2c364744bb
2013-01-10 10:00:56 -06:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Dustin Johnson
34fea3d53a Issue #1451 Allow overriding of IUserManager via ServiceLoader.
Change-Id: Iec63c05fe7365051e7bd1a01ecca701b5553c9e9

Former-commit-id: 393f51fe1b [formerly f5f6884b79] [formerly 452729a647] [formerly 19f1b30437 [formerly 452729a647 [formerly 46d756ba5cd37ae22fc31ae67dac0751c2c02985]]]
Former-commit-id: 19f1b30437
Former-commit-id: de7f6eddfab0e5e6cb4cd6a0a89817af6d81ac7a [formerly 818664e557]
Former-commit-id: cdf08ea65a
2013-01-04 12:34:43 -06:00
Dustin Johnson
7f958ac71d Issue #1449 Add interface in front of VizApp task running methods
Change-Id: I4696782d800a836f347cf72738c6c0673314a492

Former-commit-id: f7127d12f3 [formerly f6e081d331] [formerly b9c9030d05] [formerly dc61af2dea [formerly b9c9030d05 [formerly 3ed5c31344148559c0e5479f4b7955fcee7cb0a7]]]
Former-commit-id: dc61af2dea
Former-commit-id: a3e4e685d352ecc229c5ffe510888c363f9a3dc9 [formerly 19cdf2f57c]
Former-commit-id: 853ea19014
2013-01-02 11:01:15 -06:00
Max Schenkelberg
754fe67e13 Issue #1329 Fixed issues with tile intersection calculation.
Change-Id: I753abdfefc0ed38ef838c3f7b8de6d1cd1ee264a

Former-commit-id: 978c200f04 [formerly 14f102d8ae] [formerly b4952b003a] [formerly 373de78320 [formerly b4952b003a [formerly 8b5bfd7e9010f9ffd4ce019c5fd961e1b370ff1e]]]
Former-commit-id: 373de78320
Former-commit-id: 94aad176091cd344656ab44ae8b6a7db61c25bf6 [formerly adf6aed592]
Former-commit-id: 886c39f5a4
2012-12-17 17:05:34 -06:00
Max Schenkelberg
cf9e6ff3b2 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]
Former-commit-id: 5db71ca943
Former-commit-id: e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]
Former-commit-id: d43e0c1c25
2012-12-12 11:39:32 -06:00
Steve Harris
88f9070c93 Issue #1408 - Merge branch 'ss_builds' (12.12.1-12) (via branch 'mergetest') into development
Former-commit-id: e0e596120c [formerly d4686333a1] [formerly ab8b1ae64d] [formerly ce72ebb094 [formerly ab8b1ae64d [formerly 794a9a083b8340d322c915139968ba5a4fe2ee54]]]
Former-commit-id: ce72ebb094
Former-commit-id: 638be45c65cc1e7b65d1b4e332046932a30ff790 [formerly 113fdcb679]
Former-commit-id: 15849ae72a
2012-12-11 08:56:54 -06:00
Steve Harris
377804398b Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Nate Jensen
adad056c53 Issue #1396 fix thin client
Change-Id: I58dc3f40594697d8332cc372f45f30bb28927100

Former-commit-id: 52b55cdf65 [formerly 851f8977f3] [formerly 020b84e373] [formerly 03e6f7ee16 [formerly 020b84e373 [formerly 1afd50427bff0a11ebbf99eb3b29d2d8c3e02c44]]]
Former-commit-id: 03e6f7ee16
Former-commit-id: db935f8f15b87218882a4babaf96d3d58289cbba [formerly 496fa1ede9]
Former-commit-id: 7c0941e292
2012-12-07 11:59:13 -06:00
Ron Anderson
7c09ef9001 Issue #1395 Updated ShadeableCapability to specify opacity (alpha) to be used for shading
Change-Id: Ifeb87aa3dc83c34c4599f22bbb2ed540e82d6c06

Former-commit-id: 0c849c04d7 [formerly 45914e0a46] [formerly bb163074fa] [formerly b6fcd999f4 [formerly bb163074fa [formerly 596a5c305e2c7be6e76c8d623a2fd4d5a5ffb7f7]]]
Former-commit-id: b6fcd999f4
Former-commit-id: a37aae4d7e209290f67a1eb565eee632c0e19fd2 [formerly 70cca3900b]
Former-commit-id: c5b3111795
2012-12-06 17:02:56 -06:00
Ron Anderson
76141bfc05 Issue #1395 Modified LineStyle to contain a definition of the style so that GL and SWT can render them the same way
Change-Id: I9e9875c3d56870309d4c5420a541674fb8733a09

Former-commit-id: 03dff87b0d [formerly 330e913cb2] [formerly 5143e82d4a] [formerly 9398573f2f [formerly 5143e82d4a [formerly 6c2704dffcbadab19611464df580f781bb5ebefd]]]
Former-commit-id: 9398573f2f
Former-commit-id: d82c8ff0301aef55921e5f77656fa41a6963ce17 [formerly 10479a1909]
Former-commit-id: d42afa44dc
2012-12-06 15:38:04 -06:00
Dustin Johnson
46c2b31f91 Issue #1377 Break registry dependency on data delivery
Change-Id: I232f4d23497f37d5f4f9883048e9c3bda84551ea

Former-commit-id: eda8a2208f [formerly 6d1831b002] [formerly bba092f51e] [formerly 529238d010 [formerly bba092f51e [formerly f560beb5c66541859abd36cab855a7b6a8c8ded9]]]
Former-commit-id: 529238d010
Former-commit-id: a57882853f80c6e174dda103c8aec580f19821e6 [formerly 1b165c8e73]
Former-commit-id: 5953c5372f
2012-12-03 12:06:32 -06:00
Max Schenkelberg
1f8c88490a Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]
Former-commit-id: ed77d56a84
Former-commit-id: 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]
Former-commit-id: f681c1304c
2012-11-29 10:29:36 -06:00
Nate Jensen
c5a27b653a Issue #1323 fix build issue
Change-Id: I5918a05535bc7e928214075784f615cf454d2972

Former-commit-id: f2ff0e89ca [formerly cbb77b884b] [formerly d76ab40583] [formerly f24fcc07cf [formerly d76ab40583 [formerly db083d70f18b771740f73ecb787c103b5264881d]]]
Former-commit-id: f24fcc07cf
Former-commit-id: 77af90edc781818f265653aebd82cbfac24f0a3f [formerly 10be056dcb]
Former-commit-id: 8a4544a632
2012-11-27 09:07:07 -06:00
Dustin Johnson
add45e6805 Issue #1322 Move router registry to edex.xml
Amend:
  Add requestRouterRegistry to viz Spring file.

Change-Id: Id2697aaca02662bd1bb9f759070b2cde8f1dd864

Former-commit-id: ea7537804c [formerly dd82a472e5] [formerly 13b1683458] [formerly a9d01486ed [formerly 13b1683458 [formerly dc3f0b465628d312f675b16d61c0456bf79edc7d]]]
Former-commit-id: a9d01486ed
Former-commit-id: c8e8f27647ef18ecfbb5e4b6ae6a9f36c8133dea [formerly 1bb69653af]
Former-commit-id: dd03bf9bd5
2012-11-19 13:21:03 -06:00
Dustin Johnson
9b9f41cb5a Issue #1322 Add server keyed routing
Amend:
  Remove ServiceLoader files for RequestRouter.
  Resolve peer review comments.

Change-Id: I249917931c2d7fd2d074203b6007cdf66952f04b

Former-commit-id: 22c930824c [formerly d1024d091c] [formerly 87148a8061] [formerly 8a6be78eb0 [formerly 87148a8061 [formerly d7010894ecd0d1702567d52260fdf6088468eb09]]]
Former-commit-id: 8a6be78eb0
Former-commit-id: 0e562f6e19c01c0c23b34e7e423696a3b7663f29 [formerly 1d5714b994]
Former-commit-id: a448369b44
2012-11-16 14:43:45 -06:00
Max Schenkelberg
d86550c239 Issue #1243 moved locking for getFile into adapter code for cave since that is the only time a file is actually downloaded and requires locking
Change-Id: I39920677769e1a885ac7b3f1003dd52ae1dc2737

Former-commit-id: a40abfda65 [formerly a472f5535b] [formerly 655f54b098] [formerly f540f65fd7 [formerly 655f54b098 [formerly 4648ab539b37a0608ab7ebab5080317bbf618504]]]
Former-commit-id: f540f65fd7
Former-commit-id: 6ed55cce2d899bb904eca4a9886c9f8d39f745d2 [formerly f1866b2e49]
Former-commit-id: db2fe0b5e8
2012-11-15 16:21:42 -06:00
Max Schenkelberg
91607fb03e Issue #1243 Made localization lock more intelligently to avoid files getting out of sync and causing errors.
Amend: Fixed LocalizationFileOutputStream so it has option to close and save file and made LocalizationFile.write so it is more clear as to
what it is doing. Made CloudHeightData and AdaptivePlotResourceData not create FileUpdateMessages.

Amend: Rebased

Change-Id: I5aff6402004f4b4d3040c8c71f5ee16dfeb33567

Former-commit-id: 61f0c0501b [formerly fe11e31bfb] [formerly dcde9e8951] [formerly 28e61c8285 [formerly dcde9e8951 [formerly 85a0b9bb03887b9ef50e67a1ae3a36afd24b3a58]]]
Former-commit-id: 28e61c8285
Former-commit-id: 5f777b3fc72c55ae811d6c28a223bff8a71b24e9 [formerly 2e20c3e799]
Former-commit-id: 5aa26e4f13
2012-11-14 16:19:37 -06:00
Max Schenkelberg
25f5a9b1aa Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e

Former-commit-id: 1ed5f10230 [formerly 30c1802398] [formerly d1099addc6] [formerly 00822a4f39 [formerly d1099addc6 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]
Former-commit-id: 00822a4f39
Former-commit-id: 5eaaf2b42110ba677fab87f22b62f6cd269072be [formerly c4e5092f94]
Former-commit-id: 4408af827f
2012-11-12 16:46:21 -06:00
Dustin Johnson
cd5faf58bf Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]
Former-commit-id: 2d1e886cf3
2012-11-08 09:57:16 -06:00
Max Schenkelberg
f9e6347863 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: 94e64c9b0d [formerly f069f34a96] [formerly 11111d3a29cb179e3e47566262a8a2be05fd32e6 [formerly 2f90120248]] [formerly ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 42f60026840ae4bf86371ebfd3e40ca565028c4b [formerly 747ab974e9]
Former-commit-id: 5a5bd522a1
2012-11-07 10:44:42 -06:00
Dustin Johnson
fe8a2a3b09 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]
Former-commit-id: 31d7d09c10
Former-commit-id: 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]
Former-commit-id: e7a0f96a9a
2012-11-01 13:36:06 -05:00
Steve Harris
6a81945d07 Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 21136b0560 [formerly 18ec4b5933] [formerly 559540ffbbcbfef9a40622bca48b2ab297be7483 [formerly 34e7b3f4a3]] [formerly 8703ff00c7 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]]
Former-commit-id: 8703ff00c7
Former-commit-id: a128d53471bbb82cdb98a297cb2308d5a1ee6417 [formerly dc5eba737d]
Former-commit-id: 31253e2949
2012-10-17 08:21:19 -05:00