Max Schenkelberg
|
766144ed59
|
Issue #590 Fixed GFE colorbar when changing parms after setting up collaboration session. Needed to move adding of listeners to initInternal and not the constructor so recycling readds them after dispose removes them
Change-Id: Ieb5fc7786682b5b442deccf4a5292374a4a7de47
Former-commit-id: 509c5946d1 [formerly 81b6158c40] [formerly ab871d218b] [formerly 509c5946d1 [formerly 81b6158c40] [formerly ab871d218b] [formerly 61e0ea0516 [formerly ab871d218b [formerly c0d7f68bed2b141240d2e2a695c8439f7a4ffa67]]]]
Former-commit-id: 61e0ea0516
Former-commit-id: ffb4dc36e6 [formerly 460a1179af] [formerly 5a67be7c23dd5999c23928f27069f071fec4abbc [formerly 66a60a7b7b]]
Former-commit-id: fc99eff9cc2bcf562a0c5e7c523cabeb0d860993 [formerly 77aef2db41]
Former-commit-id: 379ca48057
|
2012-06-20 15:32:27 -05:00 |
|
Bryan Kowal
|
41916b3e01
|
Issue #708 - move the xmpp (openfire) rpm into the collaboration branch.
Former-commit-id: 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly 37abb38f30 [formerly ad13e81ea6] [formerly d20417a793] [formerly a828d869a0 [formerly d20417a793 [formerly 982e97b44967376b7e08138c4997a87ec1c98b44]]]]
Former-commit-id: a828d869a0
Former-commit-id: fe2c592edc [formerly 7ac868e3c7] [formerly 0237c8d764ada3f7a1e6a9ba396990a9fd82cb43 [formerly 916ce42ff8]]
Former-commit-id: fe01b191ff5a0383a52b9187bf968513677b9762 [formerly 424121af9d]
Former-commit-id: 48d821f5f8
|
2012-06-20 14:47:19 -05:00 |
|
Ben Steffensmeier
|
b55bf099f1
|
Issue #704 add INCOMPLETE PaintStatus to indicate a frame will require more painting later
Former-commit-id: 7bd0cce0a1 [formerly c2191c83dc] [formerly d317777ee6] [formerly 7bd0cce0a1 [formerly c2191c83dc] [formerly d317777ee6] [formerly 0c69731e18 [formerly d317777ee6 [formerly 65e7e8b2c891d1938f0b98c3c8737f18517fe27f]]]]
Former-commit-id: 0c69731e18
Former-commit-id: acbf7fd3b5 [formerly 8b107023d1] [formerly c5371f37fe36db2e2f33d1cc3ac56441d034b0d1 [formerly b55a4f026c]]
Former-commit-id: 5dc0b8c70d6e5a44a1db2255eb73085b81017657 [formerly 63b55f454f]
Former-commit-id: 19ce6f7e77
|
2012-06-20 14:13:37 -05:00 |
|
Bryan Kowal
|
eecb7d3b2f
|
Issue #708 - it is now possible to build edex rpms in the new baseline repository.
Former-commit-id: 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly 80adc8bbfd [formerly 11a1c4f35f] [formerly 973ceff9a7] [formerly f79134499e [formerly 973ceff9a7 [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]]]
Former-commit-id: f79134499e
Former-commit-id: 4e53eadca4 [formerly 872a3a5f60] [formerly f01648537abdc924d90c96168fabc6a20dc2d827 [formerly 1acbc16759]]
Former-commit-id: ae07adff22f508ce1afff3acfa7f125a0046379e [formerly 720c2063f0]
Former-commit-id: 66028f4fe2
|
2012-06-20 11:22:58 -05:00 |
|
Steve Harris
|
a807b5a6cb
|
Issue #708 - removed extraneous files
Former-commit-id: d15b58e5e0 [formerly 004e4c5134] [formerly ba7bd0c711] [formerly d15b58e5e0 [formerly 004e4c5134] [formerly ba7bd0c711] [formerly c0b5f3f892 [formerly ba7bd0c711 [formerly 134264091ddd0567f4789c852f8ee7b41b3dc9bf]]]]
Former-commit-id: c0b5f3f892
Former-commit-id: a0093295b2 [formerly 1a6525004b] [formerly 1590dd1d0abfff8441388e71ab16c03b3c68f4dc [formerly 764a9d2a13]]
Former-commit-id: 931c0e974a33219292a6fa03b1cbd3403f2b0d32 [formerly 1d040ee464]
Former-commit-id: e25bed485a
|
2012-06-20 08:24:45 -05:00 |
|
Steve Harris
|
9a598e011f
|
Issue #708 - removed extraneous files
Former-commit-id: de3f944384 [formerly d2e6687295] [formerly 1a67fdba3f] [formerly de3f944384 [formerly d2e6687295] [formerly 1a67fdba3f] [formerly fbe7e50417 [formerly 1a67fdba3f [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]]]
Former-commit-id: fbe7e50417
Former-commit-id: 9b2ed5764f [formerly 026a14fc2c] [formerly 83b6cf98603632c1e675f0b9f9cba42d635a5d2b [formerly eca93e924c]]
Former-commit-id: 179aacf8a7ccc5440986b45bbe1903e05e0806ed [formerly 6325fcc6f1]
Former-commit-id: 52251f3595
|
2012-06-20 08:15:55 -05:00 |
|
Nate Jensen
|
9714c66bc4
|
Merge "Issue #440 made PathManager not request data if there are no contexts to request for" into development
Former-commit-id: 6b03c17c02 [formerly bc63d08489] [formerly f74233956e] [formerly 6b03c17c02 [formerly bc63d08489] [formerly f74233956e] [formerly a8af268ca1 [formerly f74233956e [formerly dd1f52c8e5d36cccab98821018cb77f544529933]]]]
Former-commit-id: a8af268ca1
Former-commit-id: eac2ca80d3 [formerly 6b9344db87] [formerly c5258bd2f8fa1dab44cd1cdd93077e9b78bf7725 [formerly 7376a1d4ff]]
Former-commit-id: 31e39cc9185b181a4df2fd76a222ddd4d06cb96f [formerly 0aca1f1c83]
Former-commit-id: 1c7afc3784
|
2012-06-19 16:47:34 -05:00 |
|
Bryan Kowal
|
6706056477
|
Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly a6814ec7fb [formerly fa84e5df3e] [formerly 207bbd3087] [formerly 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]]
Former-commit-id: 25addabe64
Former-commit-id: f064abd37a [formerly 21a02e1510] [formerly 17ed68aef27593eee306fe2fb3bb631e5e2624fc [formerly 94e4af6d47]]
Former-commit-id: 26b9b80270ee9967c245bdeb19a771d7cfaad8d6 [formerly 85507d67dd]
Former-commit-id: b69b1e9509
|
2012-06-19 15:03:57 -05:00 |
|
Bryan Kowal
|
241826ed34
|
Issue #734 - moved the wes2bridge utilities and rpm specification into their own WA repository.
Former-commit-id: 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly 0d0ba75a14 [formerly 944a1ce201] [formerly 5aabc3bba1] [formerly dff89c83e4 [formerly 5aabc3bba1 [formerly 03e09af0cae74d0510a86ff07a31bbffbe3c4aac]]]]
Former-commit-id: dff89c83e4
Former-commit-id: 1cb8279ac7 [formerly 11ea72acf0] [formerly 6bc21555bbadb2d4481dfe124a5ad7b3415643e6 [formerly 5435963041]]
Former-commit-id: 2c6f5ee749bb3932e15d58b2f0f37f3de85c557d [formerly cb8969eb0f]
Former-commit-id: e9ab580a49
|
2012-06-19 13:33:01 -05:00 |
|
Bryan Kowal
|
f4338dc6f5
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 345f682e22 [formerly a1ba6c10be] [formerly e32406ca8a] [formerly 345f682e22 [formerly a1ba6c10be] [formerly e32406ca8a] [formerly a4c6095b76 [formerly e32406ca8a [formerly 1290be4ea8aab292b6f8d2ce1f1beda5fa15395d]]]]
Former-commit-id: a4c6095b76
Former-commit-id: dcb8a248f9 [formerly 76afa5d4b6] [formerly 85539ae32db819c9b82455e5e760e9e64caf1669 [formerly 3b2d570834]]
Former-commit-id: 8d7c431d2e3e9292fbc6c2dedb465feedb50fc52 [formerly f4346e7e01]
Former-commit-id: 9d984deb1f
|
2012-06-19 13:17:17 -05:00 |
|
Bryan Kowal
|
07ac1a35a1
|
Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 181cd0b024 [formerly 5db24885ba] [formerly f43b37604ae27b981a3dbd819486fddea450376c [formerly fd8be91fed]]
Former-commit-id: 878c85d017dfd6c22ee3a919a58b96535172278c [formerly f390151c0b]
Former-commit-id: 96e82f60e5
|
2012-06-19 13:15:53 -05:00 |
|
Max Schenkelberg
|
4255b4818f
|
Issue #440 made PathManager not request data if there are no contexts to request for
Former-commit-id: 116c64cbc4 [formerly 1e8e9db9eb] [formerly e856cfedf4] [formerly 116c64cbc4 [formerly 1e8e9db9eb] [formerly e856cfedf4] [formerly db57eeee16 [formerly e856cfedf4 [formerly d5ad7950c520e8b8d384b6dad73f0da6e84935d0]]]]
Former-commit-id: db57eeee16
Former-commit-id: a2918fa349 [formerly 15c59d6621] [formerly 6016b63b4bbe43e962ce98ea3f0b4e92a20d477e [formerly 1f10cddfa2]]
Former-commit-id: 8588e35235395f439ec234c5245640a8d8863808 [formerly 9e296ec8b9]
Former-commit-id: ecd2068cf0
|
2012-06-19 13:00:44 -05:00 |
|
Richard Peter
|
fc76667605
|
Merge "Issue #765 fix so data can be retrieved with or without hdfFileId" into development
Former-commit-id: 6c3c4990b3 [formerly 918185f564] [formerly aa6c81a2c7] [formerly 6c3c4990b3 [formerly 918185f564] [formerly aa6c81a2c7] [formerly cee183e89c [formerly aa6c81a2c7 [formerly 29f61577c289229802f89b96b53735782986366b]]]]
Former-commit-id: cee183e89c
Former-commit-id: 7dd0843160 [formerly ba9aa5df02] [formerly 4471e756c017e0fd8475409e05ab4e7b2e9d4c9f [formerly 80faa5abf8]]
Former-commit-id: 51015217dae82941ad583aecec5f47d28a309153 [formerly 19798acee1]
Former-commit-id: 3749ef4534
|
2012-06-19 09:21:24 -05:00 |
|
Bryan Kowal
|
04dacfbba3
|
Issue #708 - the wes2bridge utility product will no longer expect a src folder.
Former-commit-id: 9d0babff74 [formerly 360916143e] [formerly 8149b629d4] [formerly 9d0babff74 [formerly 360916143e] [formerly 8149b629d4] [formerly 51d7d8ccdc [formerly 8149b629d4 [formerly 0bdaa8c9344e62d1fc9594d38dfa80ae2c18d3d4]]]]
Former-commit-id: 51d7d8ccdc
Former-commit-id: 4ac52f387c [formerly 51309941cc] [formerly eeb78309d5425708a174b7bbac247c624a9254b7 [formerly b03596a173]]
Former-commit-id: 629c738546952206dfd87976b0480f461121e6ed [formerly cc6f3354b7]
Former-commit-id: 4ddb8dcce1
|
2012-06-18 18:20:40 -05:00 |
|
Nate Jensen
|
aaf15c2354
|
Issue #765 fix so data can be retrieved with or without hdfFileId
Former-commit-id: f930006834 [formerly 619b70f7fc] [formerly ae384ddf24] [formerly f930006834 [formerly 619b70f7fc] [formerly ae384ddf24] [formerly bb1ea105d2 [formerly ae384ddf24 [formerly 2931a63a74885e4594eb6f3b1539336e6b4bd4c9]]]]
Former-commit-id: bb1ea105d2
Former-commit-id: 21872217ff [formerly d7841cef54] [formerly ee6822d87212c2fe60739255b82ed1d9cd41f416 [formerly 244ca1b88b]]
Former-commit-id: 30ddaf4d3253d037ec108181694224c138cd9300 [formerly 31160b8485]
Former-commit-id: 05a77b1536
|
2012-06-18 17:20:48 -05:00 |
|
Bryan Kowal
|
550aeb21e9
|
Issue #762 - removing extra com.raytheon.uf.viz.ncep.displays.feature added by collaboration.
Former-commit-id: 7facb16ff1 [formerly 66a412e16c] [formerly 8735d101d5] [formerly 7facb16ff1 [formerly 66a412e16c] [formerly 8735d101d5] [formerly f522cf8a4f [formerly 8735d101d5 [formerly 339adb4a6795d059cc4af29b1d38d8385c5f9afb]]]]
Former-commit-id: f522cf8a4f
Former-commit-id: 26a7f1e54d [formerly dd07c2ac13] [formerly e2dc6d9e6bc3ba8e480f306a642cef44160d388a [formerly a045e729f7]]
Former-commit-id: 1ceeaa91a89682b4341c9b76dfd58c3c9c7ccd1f [formerly 5f59af1e01]
Former-commit-id: 2a43ab83cb
|
2012-06-18 13:32:31 -05:00 |
|
Bryan Kowal
|
fff0ad3727
|
Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 966c50ed06 [formerly 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]]
Former-commit-id: 966c50ed06
Former-commit-id: 7ff1e3ec1e [formerly 07b8c70b1b] [formerly 9e66bcbf05fd841edc4760a6ff074c97a234fd5c [formerly ff0c86f857]]
Former-commit-id: 9eddd502462b27d3fe6c7131e4428d9987e86831 [formerly 6d4946e753]
Former-commit-id: 89ab662ecf
|
2012-06-18 11:51:47 -05:00 |
|
Bryan Kowal
|
14f81556c3
|
Merge branch '11-Collaboration' into development
Conflicts:
cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java
Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]]
Former-commit-id: f0e3b957e3
Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]]
Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b]
Former-commit-id: a6d1f97dec
|
2012-06-18 11:16:28 -05:00 |
|
Ben Steffensmeier
|
f80cab90bf
|
Issue #704 rewrite shared meshes and tilesets to be more efficient and less deprecated.
Change-Id: I9f6ebba1bd75682b56a1e8de5a8d0b8974153f97
Former-commit-id: d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly d0354ad4e4 [formerly 2da8a0df2f] [formerly aad1eb18b0] [formerly 9068e049cb [formerly aad1eb18b0 [formerly 901f061f9e19f39cf5096a394cbd238c5562d733]]]]
Former-commit-id: 9068e049cb
Former-commit-id: e1139e8bcc [formerly bded5dde2b] [formerly b1a38642bb839232d00e6dd72ecd1785344a38a9 [formerly dd496b3d90]]
Former-commit-id: 7d72e749d750c93e98bf6d01ef30660c39424b1b [formerly 541f1b74f3]
Former-commit-id: 1a3e1ba291
|
2012-06-14 16:44:19 -05:00 |
|
Ben Steffensmeier
|
533fc946f9
|
Issue #704 various core changes to make things work smoothly in kml
Change-Id: I048f9dfdb411a95765410f48fddb54aa8eefbd16
Former-commit-id: 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 93fe267859 [formerly 2c27ec20b5] [formerly d187436589] [formerly 58356c49cb [formerly d187436589 [formerly faec1cb4e4e0ef6444da31971b937ad3ee79160a]]]]
Former-commit-id: 58356c49cb
Former-commit-id: a77d4b3564 [formerly 352648586a] [formerly 17d4d41f9a31f859cf44b9807748609d104b685d [formerly e604271c54]]
Former-commit-id: cd083b91aacf58b0d502f10fe82a3966ba4342cb [formerly 3e4b09847b]
Former-commit-id: 117c77bfe0
|
2012-06-14 16:41:05 -05:00 |
|
Ben Steffensmeier
|
a2a5caf09e
|
Issue #704 create a radial bin and azimuth range map projection so radar data can use standard api.
Change-Id: If5bba07e679881188b190363cc234ba145ce9f23
Former-commit-id: 3c4dbe4316 [formerly e629fcb15b] [formerly f63d2bc7c2] [formerly 3c4dbe4316 [formerly e629fcb15b] [formerly f63d2bc7c2] [formerly dd353747d0 [formerly f63d2bc7c2 [formerly f99f9b49b0682fccf17f6d03d5cbde7f80cf7b39]]]]
Former-commit-id: dd353747d0
Former-commit-id: c26fb13e2d [formerly 6e66b88dd5] [formerly a88a43be924ea2a9703409b12a89d3312a78044d [formerly af82c0a52a]]
Former-commit-id: 048f9a0e928ca648df7f0fc8ea474047061190f0 [formerly 0bf066fc5e]
Former-commit-id: 968a6fa7df
|
2012-06-14 16:30:34 -05:00 |
|
Max Schenkelberg
|
e0afa21cd5
|
Issue #697 fixed join issues with GFE
Change-Id: Idaaa9782865cd2299ba9fc8e18305df215f1d012
Former-commit-id: 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 7bf6b0bac0 [formerly 6b9d13211d] [formerly dac8374f52] [formerly 576dbcf340 [formerly dac8374f52 [formerly e648206c2e8129b2d63b9309f67e1ce46a1edbf0]]]]
Former-commit-id: 576dbcf340
Former-commit-id: c6ff2d0c5e [formerly 86f4c94dc3] [formerly d8716c8f4c7b38d2bdbb1ad7ed4dcf4965bc6c61 [formerly 475623fe22]]
Former-commit-id: 540791039ae6f38e1fe37b9723b81caec412cdb6 [formerly 8a0626ec3f]
Former-commit-id: d915360713
|
2012-06-14 14:18:02 -05:00 |
|
Bryan Kowal
|
91df3acbcb
|
Issue #708 - support deploying from a separate work assignment repository - initial implementation.
Former-commit-id: 11a4550eb3 [formerly 24627d52f2] [formerly 1c8b752063] [formerly 11a4550eb3 [formerly 24627d52f2] [formerly 1c8b752063] [formerly 14c912f215 [formerly 1c8b752063 [formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]]]
Former-commit-id: 14c912f215
Former-commit-id: 3d127ee45f [formerly 4a631c01ee] [formerly ad3fc2affc79c43708d17ae13d41eaa4609a8718 [formerly c1b57d1de1]]
Former-commit-id: d3b71e55a89d4a65b680452640ce9512b2c10cf4 [formerly b730eced02]
Former-commit-id: 19f8cca72c
|
2012-06-14 12:43:34 -05:00 |
|
Bryan Kowal
|
3d94c3e332
|
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
Former-commit-id: 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly 175cbf318d [formerly 5e80c45a03] [formerly dcc5675564] [formerly c0aaac4a07 [formerly dcc5675564 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]]]
Former-commit-id: c0aaac4a07
Former-commit-id: 81fa46c01a [formerly a9c2cf4fae] [formerly 1adfac8f38f065227cc081b4143843fe19b3f856 [formerly c608fc959c]]
Former-commit-id: cd07c27f5f551d77046fbda54bdadaa0fe56e393 [formerly 720a152a45]
Former-commit-id: eca1d3d525
|
2012-06-14 11:35:15 -05:00 |
|
Nate Jensen
|
3cec25f904
|
Issue #716 better tooltip
Change-Id: I9db709540cb6ac25893756139b3269adf9d4551b
Former-commit-id: 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 9ecfadaf08 [formerly 00a23080d1] [formerly 6ecd868ddd] [formerly 475a9a76b5 [formerly 6ecd868ddd [formerly 4181cc97d769bfead6f5425ec4740ab90c8b57a5]]]]
Former-commit-id: 475a9a76b5
Former-commit-id: 5e307e8098 [formerly 432e384d48] [formerly 7f803973703943102ad3a3cb9638c47e5db55064 [formerly 161159172e]]
Former-commit-id: 8678427eca1d0c20ea0430afd74980fc65c52070 [formerly eadb96f7a6]
Former-commit-id: e3596980f5
|
2012-06-14 11:20:16 -05:00 |
|
Max Schenkelberg
|
d3d126e7c3
|
Issue #697 added drawing indicator for shared display for data provider, fixed shutdown issue
Change-Id: Iccfb92e3155e8be5c780e601fb8c31ef2c74f39f
Former-commit-id: e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly e2ebf6d85e [formerly 4f391588ab] [formerly e92eb6366e] [formerly 4c8b468854 [formerly e92eb6366e [formerly c00c45f5ba1ae3bb0a0a246d1435bd10b3a8aa51]]]]
Former-commit-id: 4c8b468854
Former-commit-id: 1cb7111c43 [formerly 01a075077f] [formerly 616a42f1ff97e99d9ace0ef92f663db0476f8010 [formerly c2d278d75b]]
Former-commit-id: c10f734687a27bfd52eb2e1a230f8d603ac8152b [formerly 35e332f89a]
Former-commit-id: a7a7819910
|
2012-06-14 11:16:11 -05:00 |
|
Ron Anderson
|
2dcd35d0e5
|
Removed activetable plugin dependencies on gfe
Former-commit-id: 9b93354368 [formerly 6720a0aa77] [formerly be525f1c49] [formerly 9b93354368 [formerly 6720a0aa77] [formerly be525f1c49] [formerly a8d2c6b961 [formerly be525f1c49 [formerly 1b923c335dd69dfa5a95972f1aa749cf5497bcee]]]]
Former-commit-id: a8d2c6b961
Former-commit-id: 50fa58d036 [formerly 89b8a935c4] [formerly a0f65e1d33e360005b0b4f457fdfd9d44972bf37 [formerly c241585248]]
Former-commit-id: bfb601ee51669305bc9b5de533c77da5df465cda [formerly 40689a68e9]
Former-commit-id: 89d19595b4
|
2012-06-14 10:09:22 -05:00 |
|
Max Schenkelberg
|
e773643f7a
|
Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly 816500d7c4 [formerly 51c2a41e68] [formerly dd99479eeb] [formerly fceef3c5a1 [formerly dd99479eeb [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]]]]
Former-commit-id: fceef3c5a1
Former-commit-id: ea948bbb82 [formerly f0d2893e97] [formerly f94add25d0e7e6bf562b43f3ede6e45e7d953f95 [formerly e5e1a4de6a]]
Former-commit-id: 0763957c65637dd50362099f2ea1a0663adf6a1a [formerly f2e34fe03c]
Former-commit-id: 7bac48f643
|
2012-06-13 17:52:11 -05:00 |
|
Bryan Kowal
|
20e3af5675
|
Merge branch '9-Wes2Bridge' into development
Former-commit-id: f961a6e670 [formerly 5f2fac5ca5] [formerly 522a35f61b] [formerly f961a6e670 [formerly 5f2fac5ca5] [formerly 522a35f61b] [formerly e1addfad12 [formerly 522a35f61b [formerly 732d7b77d80e7647bc79de5df072f37a2449b0cf]]]]
Former-commit-id: e1addfad12
Former-commit-id: 2fec1d0083 [formerly 507bca23e6] [formerly d3f43b9e13819499947dfa47ec83e70b4623681e [formerly cb8b3f37b1]]
Former-commit-id: 21075fc1459cc87d982bee50b4c5248e44a16a39 [formerly 1cd279f681]
Former-commit-id: b5731d85b8
|
2012-06-13 15:29:38 -05:00 |
|
Steve Harris
|
232e525e57
|
Merge branch 'master' into ss_sync
Former-commit-id: a18fd2f871 [formerly 5a5db8dc6a] [formerly d507f3b71d] [formerly a18fd2f871 [formerly 5a5db8dc6a] [formerly d507f3b71d] [formerly 645359deaf [formerly d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]]
Former-commit-id: 645359deaf
Former-commit-id: 5d7a28156d [formerly 0c29bee8e1] [formerly faa52b5e6af76bc7945f0e7bfd703b9788e135ca [formerly c778c97bd6]]
Former-commit-id: 190b2bc953e4200127e34845882f6c1614215e26 [formerly a6fd9689d5]
Former-commit-id: d1b2c73b81
|
2012-06-13 14:56:52 -05:00 |
|
Matt Nash
|
8d4c56a8fe
|
Issue #711 add roles and site capability
Former-commit-id: e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly e6d34de494 [formerly 48bf29974c] [formerly a9d225066a] [formerly 032827aa1b [formerly a9d225066a [formerly a49eee36dac39f172d7c4fa723a297d7cf94d5db]]]]
Former-commit-id: 032827aa1b
Former-commit-id: cd82be177f [formerly 4cd558c1ca] [formerly 088352035d7c18e15170c346ce036e12429d923d [formerly 13a1fa879e]]
Former-commit-id: 2517511e613bba992f8b86185817595698a5b0bb [formerly 34f57345ac]
Former-commit-id: 4e1074e262
|
2012-06-13 12:58:11 -05:00 |
|
Matt Nash
|
3309b5109e
|
Issue #659 fix floating view issue when minimize happened
Former-commit-id: 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly 7dc3044f26 [formerly 3689ed489e] [formerly 96bf8b356a] [formerly b65a0f124e [formerly 96bf8b356a [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]]]]
Former-commit-id: b65a0f124e
Former-commit-id: 455ac1faf9 [formerly 9e81392638] [formerly d25734d06b93a1a330c627b9c997a28dbfb4665a [formerly 3bd1a43af2]]
Former-commit-id: 87796f659980b8c75e5089847bd5b3ce9c36af1d [formerly 8eac89d337]
Former-commit-id: 576e5c5310
|
2012-06-13 10:04:12 -05:00 |
|
Nate Jensen
|
5bd5e7e8ab
|
Issue #716 fix lots of minor issues, fix merge problem
Change-Id: I5a43ad089766b5f2a9a3ea6901d8f6761983b575
Former-commit-id: 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 653dca2e66 [formerly eedc68c32c] [formerly 619d3062c2] [formerly 47e8561dd0 [formerly 619d3062c2 [formerly ae131c0d05148e58ba445e5f144aa21c8c5c12c3]]]]
Former-commit-id: 47e8561dd0
Former-commit-id: f6e823019d [formerly 3b8b89fc84] [formerly 2308c40a943076535f277701e53e28c076040f00 [formerly 2cf220ff0c]]
Former-commit-id: 60141babfba9cd1cc99bd9241af68ac6ae22cb36 [formerly 1a8935e86d]
Former-commit-id: da2ab4d95b
|
2012-06-13 09:39:19 -05:00 |
|
Steve Harris
|
a45d1b99e1
|
Removed duplicate method created by merge
Former-commit-id: 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 787b82079e [formerly 282682ccc1] [formerly 5f66b0995a] [formerly 308737bff8 [formerly 5f66b0995a [formerly 90fc678948690cc74488e6e1fd18cf8c72c5c0c9]]]]
Former-commit-id: 308737bff8
Former-commit-id: 1dfba0c41c [formerly 383f9d2d56] [formerly 193d13e25a301eced23e253c03817720893c41dc [formerly 55b4d7c5da]]
Former-commit-id: 17fcfe21c5a7a6a71cb9d46ffde283702dcb2baf [formerly 0de9e03c5a]
Former-commit-id: b3c2646e5e
|
2012-06-13 08:41:24 -05:00 |
|
Steve Harris
|
ec9204fa94
|
Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
cave/build/p2-build.xml
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java
Former-commit-id: 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 03383359f3 [formerly af6c0529ad] [formerly 2f20a86a30] [formerly 48860df690 [formerly 2f20a86a30 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]]]]
Former-commit-id: 48860df690
Former-commit-id: 6c0d8be39e [formerly d7a4853091] [formerly 2439ad1c1bff354f69594e31d7a2a27f4fc21bc4 [formerly 27b50c57bd]]
Former-commit-id: e4fb4019cc599080c632d3e4becfebc21fb21929 [formerly 2838ca117f]
Former-commit-id: 70a928d039
|
2012-06-12 14:37:12 -05:00 |
|
Nate Jensen
|
4562192f22
|
Issue #716 removing unnecessary file
Change-Id: I439f95ab54eb6fa3765438dcb77a94445dc2ebba
Former-commit-id: c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly c33b8ac729 [formerly 4b54691479] [formerly 07d44ae528] [formerly cd14177a84 [formerly 07d44ae528 [formerly 5ade0f2437308ab21429432746cf4e71afc33c93]]]]
Former-commit-id: cd14177a84
Former-commit-id: 0ea1d3d522 [formerly 37342dd500] [formerly 55fa3a0d6686e52246676ff642dd31616024215b [formerly 090bb2918b]]
Former-commit-id: ed74a356bf1ee9bbd35c69fc624517a8e3a2dbaf [formerly 38fcee07e8]
Former-commit-id: ed987231b5
|
2012-06-11 17:34:21 -05:00 |
|
Nate Jensen
|
b9936a5352
|
Issue #716 fix disabled toolbar
Change-Id: I464d0560cf7462b37d324db368411f3867e53602
Former-commit-id: 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 9df6b2b051 [formerly c3c4a8519a] [formerly d2bb1b6e0c] [formerly 0c869f599e [formerly d2bb1b6e0c [formerly d32771cbbe72a32965c50aacd7ede3383a5fff23]]]]
Former-commit-id: 0c869f599e
Former-commit-id: df09de658a [formerly 38a3e93585] [formerly 4c1efdb14c6c9055c3df149ffd219afabd6b73a7 [formerly ea33fc82fe]]
Former-commit-id: 71537803326c931bf18fe6de065205a643fe013a [formerly 91b7225c2f]
Former-commit-id: ab30be436b
|
2012-06-11 17:33:48 -05:00 |
|
Steve Harris
|
883d66bc46
|
12.6.1-5 baseline
Former-commit-id: 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 1ad64ffa98 [formerly 09f73b0601] [formerly c99afab05f] [formerly 8947efbc7f [formerly c99afab05f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]]]]
Former-commit-id: 8947efbc7f
Former-commit-id: d5c94ccef2 [formerly b69fa75919] [formerly 1cc870696aedf27ab003448e1146bd540b248a33 [formerly a945ed8e6d]]
Former-commit-id: fc6eb550115880692c0f2fd68727ccec55d0eef7 [formerly 91e65230ad]
Former-commit-id: 3b468d9f50
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
581546a5eb
|
12.6.1-3 baseline
Former-commit-id: bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly bc96eba820 [formerly 7c5306b795] [formerly 42f3513175] [formerly d57eb02b9e [formerly 42f3513175 [formerly 2f4e12140a9b026770563eee58577b8aa2c041e1]]]]
Former-commit-id: d57eb02b9e
Former-commit-id: 471fa3ac04 [formerly 32c0464d79] [formerly 3b70f39d074d5d11b45290eba7eec94d80be38de [formerly 1fdc0aa237]]
Former-commit-id: 47799c2c228b75794e62bf6b17a80d2d42cdf2cc [formerly ca8baf18a3]
Former-commit-id: 518fa79f7f
|
2012-06-11 16:23:47 -05:00 |
|
Steve Harris
|
210264e57e
|
12.5.1-15 baseline
Former-commit-id: e108f0488b [formerly e573d25da7] [formerly e8a0d40b73] [formerly e108f0488b [formerly e573d25da7] [formerly e8a0d40b73] [formerly 8d5e739a61 [formerly e8a0d40b73 [formerly a5f61b51742cf97f02253e5e6ca988e7ffa9b26d]]]]
Former-commit-id: 8d5e739a61
Former-commit-id: 3cb84066b9 [formerly f79edb6135] [formerly e103ba629b7a7ee412f9b030b39e16abbd154cf0 [formerly 6db76e884c]]
Former-commit-id: 55bebc37cd68d7fdfb520da32e2987aa0e2fa223 [formerly a8393146b1]
Former-commit-id: 0787d9ee94
|
2012-06-11 16:23:11 -05:00 |
|
Steve Harris
|
3e503cb0ac
|
Removed extra files from 12.5.1-15
Former-commit-id: 4715df9d59 [formerly 9b993d3152] [formerly 288233a06c] [formerly 4715df9d59 [formerly 9b993d3152] [formerly 288233a06c] [formerly 9612d7e90c [formerly 288233a06c [formerly 3c367f4c3b2b2f5bc64b8eb43ed5eb66deda129f]]]]
Former-commit-id: 9612d7e90c
Former-commit-id: 66e3a94584 [formerly d6a864c7b6] [formerly cd05d7977aaebea7681f369b3d2deeaf1cb5e685 [formerly 76e3f566f4]]
Former-commit-id: b450338a7ca1fabc114f10bc6fb5f0702b085a50 [formerly bfce1b5084]
Former-commit-id: 6dd6f0070a
|
2012-06-11 16:18:26 -05:00 |
|
Steve Harris
|
61e2068af7
|
12.5.1-15 baseline
Former-commit-id: 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly 244755b393 [formerly 0ca936807e] [formerly d5c238de07] [formerly cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]]]
Former-commit-id: cee20d8656
Former-commit-id: cd017cbb21 [formerly 31d7649939] [formerly 71d57ecda7503a310fc8294587521ac3d45da531 [formerly 7da9afe36a]]
Former-commit-id: 6cb525b2e1f0b266e8a8aef21ae0d0c57440c151 [formerly ad91dc8a2e]
Former-commit-id: ca0f3f5814
|
2012-06-11 16:02:30 -05:00 |
|
Matt Nash
|
f24e018c7e
|
issue #693 always allow to invite users after opening create session dialog
Former-commit-id: be806cfe61 [formerly 179f2d7ffe] [formerly 9f2d97fa68] [formerly be806cfe61 [formerly 179f2d7ffe] [formerly 9f2d97fa68] [formerly b78d86bf04 [formerly 9f2d97fa68 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]]]
Former-commit-id: b78d86bf04
Former-commit-id: f632b29005 [formerly 4b5af450d1] [formerly 573ee429242ddd058ed5a3d6a8f2cfdb13e96669 [formerly 03ee9d8a90]]
Former-commit-id: e86d83eaf529b848bcf2ae0610014f8f775227c6 [formerly 3e54a2fd18]
Former-commit-id: c13ca2f81b
|
2012-06-11 15:34:49 -05:00 |
|
Steve Harris
|
b54ad5af66
|
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly 975053c3dc [formerly c7024992a3] [formerly 37793c86b1] [formerly d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]]]
Former-commit-id: d325d496f5
Former-commit-id: 5e0e2d2c48 [formerly 23c34c469a] [formerly 788e16ce64aaeca91000aa565d43e89a27246362 [formerly cf3c768213]]
Former-commit-id: bbdcec83196c1a64fd2e31c1e9abdcf46698ab0b [formerly 3dd5b84aa2]
Former-commit-id: c01b096242
|
2012-06-11 15:24:03 -05:00 |
|
Matt Nash
|
82bc8ed96f
|
Issue #693 add nws_collaborate view, and ability for default on startup or not
Former-commit-id: f3203fa469 [formerly c3b17038f9] [formerly 73da2b1fe8] [formerly f3203fa469 [formerly c3b17038f9] [formerly 73da2b1fe8] [formerly 022e982aae [formerly 73da2b1fe8 [formerly b50cfeb8633e2b9a0d2fc7bb848bbcf7d0404321]]]]
Former-commit-id: 022e982aae
Former-commit-id: c2612e2dde [formerly 945b47e29e] [formerly 861d32c390a280d83c199cb720b2c6374e7bc9b5 [formerly d5e3c97d98]]
Former-commit-id: 0a56ab9472026604b58882f46ecf932176dc4bee [formerly 3a82f9690b]
Former-commit-id: 3f528cbd85
|
2012-06-11 10:24:35 -05:00 |
|
Matt Nash
|
bc77d1a297
|
Issue #703 can change font size in sessions
Former-commit-id: 5ebc7109a7 [formerly 73ad806eb2] [formerly 9d187cc362] [formerly 5ebc7109a7 [formerly 73ad806eb2] [formerly 9d187cc362] [formerly 4b72bb3d8e [formerly 9d187cc362 [formerly 0e7af586cd96a21540263474f321bd224c45ad54]]]]
Former-commit-id: 4b72bb3d8e
Former-commit-id: aa8e09eece [formerly 11f07ec579] [formerly c2017b77c052809d1df4e0528806f872af4bbb29 [formerly 4453a06f31]]
Former-commit-id: 6afda7f78a4d01d12792cd817aa4e48730a4c6d6 [formerly 822bd01fd9]
Former-commit-id: 254b673be7
|
2012-06-11 10:23:45 -05:00 |
|
Matt Nash
|
52aafd94d3
|
Issue #659 make fixes to float/dock
Former-commit-id: 8acb6d3be2 [formerly 5accda84c9] [formerly cc5c172a77] [formerly 8acb6d3be2 [formerly 5accda84c9] [formerly cc5c172a77] [formerly 1f54c2d09d [formerly cc5c172a77 [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]]]]
Former-commit-id: 1f54c2d09d
Former-commit-id: a45f167db2 [formerly b55c763a34] [formerly 89258ee3faab44a96efb6b9c4e30d16189f39336 [formerly ae53309d60]]
Former-commit-id: 1edc92caef4989e72b40b976f60a2350c9887a80 [formerly 94bc675780]
Former-commit-id: e1d1dbe568
|
2012-06-11 10:21:40 -05:00 |
|
Nate Jensen
|
90024af34e
|
Issue #427 fixed issues
Change-Id: I984b6ccefd84e90d0296e1b38b8dd30b241546f8
Former-commit-id: 0898ad6970 [formerly 1b03a14b23] [formerly db3027c0d6] [formerly 0898ad6970 [formerly 1b03a14b23] [formerly db3027c0d6] [formerly 14c2b1271e [formerly db3027c0d6 [formerly 64e3f77ac8ebc03c0e15c3d4ac513df78f05b00a]]]]
Former-commit-id: 14c2b1271e
Former-commit-id: 12349cb28c [formerly 00d6ab7011] [formerly 5ee879b8b797327bc67609b7ff31f3add788ec9a [formerly 680325f03c]]
Former-commit-id: 551171498a9b3ed67a14e5cbc3bb9cb3b6b9a0ff [formerly 29d5237dd5]
Former-commit-id: 37af033b53
|
2012-06-08 16:10:57 -05:00 |
|
Nate Jensen
|
e5d058d826
|
Issue #427 remove login and event subscription code from CollaborationDataManager
Change-Id: I18a2c44a275f5180d828184001fd1c5173ea2f74
Former-commit-id: f23374c349 [formerly 8d741bc4a1] [formerly 05389dac56] [formerly f23374c349 [formerly 8d741bc4a1] [formerly 05389dac56] [formerly 28f779e7b9 [formerly 05389dac56 [formerly 2306edfd4e11b512a68320ae7dc4edbcfa474934]]]]
Former-commit-id: 28f779e7b9
Former-commit-id: 532dea1d07 [formerly d1f42605dd] [formerly 6cae7cb8d33deb749c2a7e78231ac292ef8fc2fa [formerly 0271c9762d]]
Former-commit-id: 160d53a81a4c9fde7867c9e162b4a74175424bed [formerly 1b76e1c855]
Former-commit-id: 413d929248
|
2012-06-08 15:15:03 -05:00 |
|
Steve Harris
|
46068c6716
|
12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
|
2012-06-08 13:39:48 -05:00 |
|