xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3469 commits 31 branches 40 tags 3.8 GiB
Commit graph

2081 commits

Author SHA1 Message Date
Bryan Kowal
41b1452db4 Issue #2164 - correct feature build order based on addition of new feature; declare avnfps dependency on new feature 
Former-commit-id: d162a2d4fb [formerly 06fc7d50d9] [formerly c0dc06d6be] [formerly c042734b88 [formerly c0dc06d6be [formerly 19c49ef06500f4d2e588a0a7b3889da2dddd30a4]]]
Former-commit-id: c042734b88
Former-commit-id: e22b5c9a21e3406d0905b12516ea32fa331a9ffd [formerly 4e9a325104]
Former-commit-id: 2f0a2dc66f
 2013-08-20 19:22:07 -05:00
Nate Jensen
82fb4ec383 Merge "Issue #2269 add new acarssounding feature to resolve dependency issues." into development 
Former-commit-id: 84a340c654 [formerly 8d020df109] [formerly 000966f04f] [formerly c498e13951 [formerly 000966f04f [formerly 95e387e528abd58efd296275447edda7572f77de]]]
Former-commit-id: c498e13951
Former-commit-id: 3dd91aefa9c2448709d54a1fea4c01340ef26fdf [formerly 1051e7c99e]
Former-commit-id: a8ce9f93f9
 2013-08-20 17:06:33 -05:00
Ben Steffensmeier
72f62123a6 Issue #2269 add new acarssounding feature to resolve dependency issues. 
Former-commit-id: 98b53fc247 [formerly a271dd3416] [formerly b51bd9bf9e] [formerly b2989eb937 [formerly b51bd9bf9e [formerly eb6b98e80f483f330022481889522dcfd7f0e526]]]
Former-commit-id: b2989eb937
Former-commit-id: b95881bbde93eecc2c05d9174a1bec63e36307ea [formerly a9bb310daf]
Former-commit-id: b0b16f1e93
 2013-08-20 14:41:57 -05:00
Roger Ferrel
6fb558b74b Issue #2220 Better response using priority queues and delay getting display data. 
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: b9bf2ab9b7 [formerly 73cc41435b] [formerly 23bfd136b2] [formerly c626f25565 [formerly 23bfd136b2 [formerly 41b9f80efe66151a16b0df5b74ccc2904ac19e20]]]
Former-commit-id: c626f25565
Former-commit-id: c072ef91f16d6f97d00a8d53a1b34beec38c5335 [formerly 62563c8b7b]
Former-commit-id: 7d97beec44
 2013-08-20 11:55:19 -05:00
Ben Steffensmeier
074c2c56f2 Issue #2269 Fix MDCRS data and switch acars to use nsharp. 
Former-commit-id: fcf969bcc5 [formerly d4b2bf52fb] [formerly 5fd84f4516] [formerly f778b53310 [formerly 5fd84f4516 [formerly 30b4923ee25dcba22e79f03ae5a3e8cec8f9683e]]]
Former-commit-id: f778b53310
Former-commit-id: cee01004c8b155fef2d5b6504e9033362ddacfbc [formerly 2d54492d7f]
Former-commit-id: d7d0a42633
 2013-08-19 17:23:03 -05:00
Nate Jensen
bc4a26bfd6 Merge "Issue #2260 Switch goessounding to NSharp. Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b" into development 
Former-commit-id: 5853ce39b7 [formerly 9ac6600e92] [formerly d5426a47ba] [formerly 2635170d1d [formerly d5426a47ba [formerly b00130e76268a896bcda6edfc62f2e0238c377cc]]]
Former-commit-id: 2635170d1d
Former-commit-id: a25012b97035ee04336462aeb244239d0501e0f2 [formerly 0c8619e01e]
Former-commit-id: 64e9f13e0a
 2013-08-19 17:22:48 -05:00
Ben Steffensmeier
473e12d269 Issue #2260 Switch goessounding to NSharp. 
Change-Id: Ie78c4456758dcbce845cfb85da3e2e69ec74323b

Former-commit-id: 2f1a87f8f1 [formerly aa204eba5e] [formerly 2f0c0c9cf2] [formerly 54310cd87e [formerly 2f0c0c9cf2 [formerly 7e0b4473c5ebe30794014b43ffc2788eb98fc47f]]]
Former-commit-id: 54310cd87e
Former-commit-id: 20b6f26b6bde3eb7e046e53a5e8646a62c0e5465 [formerly d2237d9e44]
Former-commit-id: c48cda36c0
 2013-08-19 16:34:42 -05:00
Lee Venable
18b63c6cff Merge "Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog Peer review comments" into development 
Former-commit-id: f666a24c75 [formerly 23dca45a0c] [formerly b8d050a172] [formerly 6f1e633d57 [formerly b8d050a172 [formerly cb230698c8be8faef2441171f2270e41807f797d]]]
Former-commit-id: 6f1e633d57
Former-commit-id: 3973cbe4b9deebe7fb069043bda07496e2099871 [formerly e1b9d4cf81]
Former-commit-id: a4cb2d6d21
 2013-08-19 15:14:22 -05:00
Bryan Kowal
99e3667a78 Issue #2169 - gzip data uris; entities that receive data uris will unzip them before running thrift conversions. 
- Amend: updates for 32-bit edex_com
- Amend: do not synchronize when building the message
- Amend: use the byte array pool
- Amend: default to data decompression when the queue is edex.alerts

Change-Id: I79a1f3d3d698c67019a4aa33e667fef99f6ebc17

Former-commit-id: 35cacacc45 [formerly 7e61461e86] [formerly 3eaacdb522] [formerly 2e1a8eb2b3 [formerly 3eaacdb522 [formerly 120aa0d6ee671e20734f8efb7bad89ff1b145629]]]
Former-commit-id: 2e1a8eb2b3
Former-commit-id: f55be8607a629311fb3cfbbd46fe9a4e8526f65a [formerly 5c0af47d6d]
Former-commit-id: 18c9026455
 2013-08-19 12:06:30 -05:00
Lee Venable
9df214963f Issue #2256 - Memory leak fixes and some code clean up fixes. 
Change-Id: I7b16871f59e63218b1d5754ac460bbab056f78a5

Former-commit-id: 1b42530bd5 [formerly 212c830986] [formerly 07a693be642bdf598991b8eb12713f771a59f066 [formerly 752371bc63]] [formerly 49c06062fe [formerly 752371bc63 [formerly 67228c5208da07cc56b95ce378ec50370541a260]]]
Former-commit-id: 49c06062fe
Former-commit-id: 978b819ec8fd9cfe7db2d321fd3dab87bab0134e [formerly 606c25c093]
Former-commit-id: c11caef6ca
 2013-08-16 15:04:28 -05:00
Mike Duff
a6241aa1f7 Issue #2180 - Implement front end of ogc encryption, redesign DD system management dialog 
Peer review comments

Change-Id: I4b2eef5a0d0697e2f94aa7c59872c73cb3b350b0

Former-commit-id: e0ddf25ffb [formerly 89cdc61d65] [formerly 70af70ba8d] [formerly 6190281e77 [formerly 70af70ba8d [formerly 938c6d3151fc5b7513ee48fe9e9de0c60e7799a8]]]
Former-commit-id: 6190281e77
Former-commit-id: d87f78a39b53d661f4c977717f1277c1b9e92059 [formerly c4c73b4e3b]
Former-commit-id: 8d27c7b420
 2013-08-16 13:13:02 -05:00
Nate Jensen
6d6c0d121b Merge "Issue #2260 Switch poessounding to NSharp. Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78" into development 
Former-commit-id: 5b2e7006b6 [formerly f5e84f17ea] [formerly 469df6d806] [formerly d28cb1ff68 [formerly 469df6d806 [formerly 2f69b0b239a292711ed6b40a1348d357f65bdc67]]]
Former-commit-id: d28cb1ff68
Former-commit-id: c43551d6dbc778aac9cbe8d81d942096567b5381 [formerly b34d67ced3]
Former-commit-id: 8f6f749c60
 2013-08-16 10:06:32 -05:00
Lee Venable
a94230dbe5 Merge "Issue #2143 - Fix various issues with SCAN/DMD/TVS" into development 
Former-commit-id: 7be73d7d2d [formerly 65b9b35dbe] [formerly ec5668caef] [formerly fbb341f176 [formerly ec5668caef [formerly 83920d5ea505a04b920ab2da3caa7d27cf55d43b]]]
Former-commit-id: fbb341f176
Former-commit-id: de5baac7fed91a1ab239ef66f170086b7b7e88ba [formerly faaeb93c7d]
Former-commit-id: de18cd342d
 2013-08-16 08:32:25 -05:00
Ben Steffensmeier
644b43649a Issue #2260 Switch poessounding to NSharp. 
Change-Id: Ib1d067727ab6db11c20de308dce34d6752e79e78

Former-commit-id: 63604dad27 [formerly fb23de355e] [formerly 36a920333f] [formerly 74b0b57f4b [formerly 36a920333f [formerly 4e83b721a46cea5af56fd2444ba4bf22813604e9]]]
Former-commit-id: 74b0b57f4b
Former-commit-id: 2dc426002f0ac501f60be71e2c0a10436e7cf8c8 [formerly 94e79ff7b4]
Former-commit-id: ad82565d1a
 2013-08-15 17:51:52 -05:00
Nate Jensen
5d7f35f850 Merge "Issue #2258 Convert profiler sounding to var height with hodo. Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6" into development 
Former-commit-id: 1b7c95291f [formerly 0f006e221e] [formerly b92b67676c] [formerly e4825013dd [formerly b92b67676c [formerly 2a570e7691354ff43d2cec751bfe2e51ef84c902]]]
Former-commit-id: e4825013dd
Former-commit-id: 67342bbbf9aecfe214a6724f0d72bc06fb6a1f30 [formerly 925478cac7]
Former-commit-id: 78f8b742a6
 2013-08-15 17:46:59 -05:00
Ben Steffensmeier
7811f7c18b Issue #2258 Convert profiler sounding to var height with hodo. 
Change-Id: I7b8c704ebc847169c2d09bb0bea13d0b60a9cff6

Former-commit-id: e401fe335f [formerly b7b18e02bf] [formerly 0c2f894b82] [formerly 32a0b19a38 [formerly 0c2f894b82 [formerly 2aab48d1032c0b6fd14645437836ad5ca13cb415]]]
Former-commit-id: 32a0b19a38
Former-commit-id: b2f2e9a8c3c371425dac6b0fe4ec8f9a52e935af [formerly f75824d4bc]
Former-commit-id: 890eaa3751
 2013-08-15 16:15:15 -05:00
Nate Jensen
64089c2441 Merge "Issue #2033 moved avnfps and text workstation files into respective plugins." into development 
Former-commit-id: 6643be23ad [formerly 65753deffe] [formerly ad209867bd] [formerly 5ad699cd5b [formerly ad209867bd [formerly 54f5b92e5ce56be84d938cd47d5bd43b98b1251b]]]
Former-commit-id: 5ad699cd5b
Former-commit-id: f1ed73ab0088e472f8d47689c83d4e89b389e4d5 [formerly 313eeaac9e]
Former-commit-id: b322a51e1e
 2013-08-15 16:07:42 -05:00
Mike Duff
f84671f284 Issue #2143 - Fix various issues with SCAN/DMD/TVS 
Change-Id: Ice9a0f13881c31ca1d51f2f2158f74caa064f1f8

Former-commit-id: 71d725ae07 [formerly e31a6c3426] [formerly c871d6a1cd] [formerly 640a154647 [formerly c871d6a1cd [formerly 0d5a35fcaac31c594ae7e5abda889e75a772c352]]]
Former-commit-id: 640a154647
Former-commit-id: b69387bbc5be20457dc6bf7e7e6e921b75d8fabc [formerly 03b3b3860a]
Former-commit-id: 136a98785b
 2013-08-15 14:14:07 -05:00
David Gillingham
be64302011 Issue #2262: Fix ImportError and misnamed method in meteolib.py. 
Change-Id: Ic6eb7de7b8c5b6ff7fbd989a43d00c97ea688364

Former-commit-id: d43d6506fa [formerly a8868c5beb] [formerly 8ef34db798] [formerly 953fc192a1 [formerly 8ef34db798 [formerly b61065e473c5f783ebe3cfd603a9e7bd91b63a11]]]
Former-commit-id: 953fc192a1
Former-commit-id: 502cb37326055c452bc1b35e8e9edab2d5e952b0 [formerly a4ed28a384]
Former-commit-id: afbb147ef6
 2013-08-15 13:14:39 -05:00
Steve Harris
aba7f09b15 Merge branch 'omaha_13.5.1' (13.5.1-16) into development 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	nativeLib/edex_com/.cproject

Former-commit-id: 56416708fc [formerly 3f8cc1daf3] [formerly 8484f03bb8] [formerly 891f00d650 [formerly 8484f03bb8 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]]]
Former-commit-id: 891f00d650
Former-commit-id: 39e71fd5cc358e2f7e3567f0928d250b71241a87 [formerly 44251fd949]
Former-commit-id: 2681f1f045
 2013-08-15 12:50:08 -05:00
Steve Harris
27a5acb143 Merge branch 'master_13.5.1' into omaha_13.5.1 
Former-commit-id: 8f0b0c1514 [formerly 08b105a492] [formerly 727eba03b9] [formerly a687da6075 [formerly 727eba03b9 [formerly 85cde5da231741012e611250a5c3490467aeef1b]]]
Former-commit-id: a687da6075
Former-commit-id: d74946ee629b4883a0e073d9f37dae4d8ca4ed97 [formerly 522867f068]
Former-commit-id: e5c50ad0b6
 2013-08-15 12:46:48 -05:00
Steve Harris
ca5796e082 13.5.1-16 baseline 
Former-commit-id: 47130c98a5 [formerly 6818d80085] [formerly 34ed84336297f15bcf09076786d608ada5df2472 [formerly cd3b63d961]] [formerly 7ce0234d76 [formerly cd3b63d961 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]]]
Former-commit-id: 7ce0234d76
Former-commit-id: 0cee24c9ec1cc1b51da8edf9a2cdeef3b66498e1 [formerly d7b1ed4900]
Former-commit-id: e881ff6271
 2013-08-15 13:40:37 -04:00
Max Schenkelberg
62f4f1bafb Issue #2033 moved avnfps and text workstation files into respective plugins. 
Change-Id: If95cb839ad81ca2a842ff7f6926847ac3928d8f2

Former-commit-id: db24201469 [formerly bbad83c21a] [formerly 6f60751ec6] [formerly c5575f9624 [formerly 6f60751ec6 [formerly 77e1a4d8f5237e5fae930c1e00589c752f8b3738]]]
Former-commit-id: c5575f9624
Former-commit-id: 33159773a1764cd4fb517d13a3cff0a11feaa433 [formerly 8de539020d]
Former-commit-id: 8139e0dfb7
 2013-08-15 12:21:43 -05:00
David Gillingham
218ec39696 Issue #2262: Port hgt2pres, ztopsa, ptozsa, calcrh from meteolib into 
Java. Convert to use of these new methods where possible. Create unit tests.

Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d

Former-commit-id: bd9b224ff5 [formerly c17f8b4409] [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 0b6b0e06cc [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 677ad3a406560b6ea868401e4fe7be87a4817e25 [formerly 8d347252d2]
Former-commit-id: 9c656c28b9
 2013-08-15 11:30:45 -05:00
Jonathan Sanchez
93efe34bc1 Issue #2243 Resolved timing issues. 
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly bc30396b63 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]
Former-commit-id: bc30396b63
Former-commit-id: 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca]
Former-commit-id: 19853a4b57
 2013-08-15 10:56:37 -05:00
Ron Anderson
afcfafb027 Merge "Issue #1133 Better error handling for invalid polygons in map resource. Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442" into development 
Former-commit-id: d70ba1184d [formerly 5afcf8bee2] [formerly 2b491f11ad] [formerly ca560e5fc0 [formerly 2b491f11ad [formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]
Former-commit-id: ca560e5fc0
Former-commit-id: 721ef25321b96666b7f8c0e38c59a7d3b652d02c [formerly 86b10cfd4b]
Former-commit-id: 7924115bbc
 2013-08-15 10:50:57 -05:00
Ben Steffensmeier
6b5e7b465b Issue #1133 Better error handling for invalid polygons in map resource. 
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442

Former-commit-id: b887dcbe6d [formerly aa08c8af42] [formerly 27594e6808] [formerly 7f9bbf3d52 [formerly 27594e6808 [formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: 2620f59e4670bcb1f4adcdc1ccc3ccf9e49ea0f2 [formerly 5b51795a18]
Former-commit-id: b970d2ffbb
 2013-08-15 10:32:28 -05:00
Richard Peter
309c524817 Issue #1977: Fix merge issue with WarngenDialog 
Former-commit-id: 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]
Former-commit-id: a5383dbfa4
Former-commit-id: adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7]
Former-commit-id: c8ad0e3317
 2013-08-14 15:33:02 -05:00
Richard Peter
84bef1f2ec Merge branch 'omaha_13.5.1' (13.5.1-15) into development 
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]
Former-commit-id: 2a9276c728
Former-commit-id: 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]
Former-commit-id: c0b0eef331
 2013-08-14 15:23:18 -05:00
Richard Peter
28a53c8a33 Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]
Former-commit-id: 3f65eaf74b
 2013-08-14 14:29:55 -05:00
Nate Jensen
edbd00224d Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development 
Former-commit-id: 9407a5202a [formerly 3b97de573a] [formerly 9776721a46] [formerly 0947f358b1 [formerly 9776721a46 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]
Former-commit-id: 0947f358b1
Former-commit-id: 4e7d46f90eefa803d5b1de7984747157dee229fb [formerly b1882e2e42]
Former-commit-id: 49567ae86c
 2013-08-14 12:55:15 -05:00
Richard Peter
143973d9d0 Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development 
Former-commit-id: 2169c7ae71 [formerly 72ecb0b995] [formerly cfe449d838] [formerly 045d3cd618 [formerly cfe449d838 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]
Former-commit-id: 045d3cd618
Former-commit-id: d416d75ca336101c5ae43270118c2986ff81ec92 [formerly 3f456db0f1]
Former-commit-id: f02fc50031
 2013-08-14 10:53:53 -05:00
Mike Duff
d0df6c3107 Issue #2247 - Fix permission displays in UserAdmin Dialogs 
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

Former-commit-id: 3959e7e9f8 [formerly e319928638] [formerly 097028ec59] [formerly e791617acc [formerly 097028ec59 [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]]
Former-commit-id: e791617acc
Former-commit-id: ba7884d6eb75737a8c3c26d231fc65031b3c02a1 [formerly 081d30db4f]
Former-commit-id: b70b7a0681
 2013-08-14 10:13:05 -05:00
Steve Harris
6f1b6d494f 13.5.1-15 baseline 
Former-commit-id: b05abcaec0 [formerly 535218c676] [formerly 53e96e21db] [formerly c6dc1817e7 [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]]
Former-commit-id: c6dc1817e7
Former-commit-id: c5d936eabd4d2eeade071aad734eb9b268940a49 [formerly 65beefde58]
Former-commit-id: 4f9288e7c1
 2013-08-14 10:24:26 -04:00
Max Schenkelberg
41cc45e8fc Issue #2033 moved bundles and menu files into corresponding plugins 
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 116cd76f43f817c4146cfbf39bb00d7365fdbc12 [formerly 759ff7bcfd]
Former-commit-id: 2fc5af010d
 2013-08-14 09:20:28 -05:00
Steve Harris
4e75333155 13.5.1-14 baseline 
Former-commit-id: c6465a3398 [formerly b848317203] [formerly d695e5debe] [formerly 80e5f7fbd4 [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: 979d519294a0cce041889e9000a739088fbe1b71 [formerly cd5b1e9e2f]
Former-commit-id: 9bd983e2fe
 2013-08-14 10:07:41 -04:00
Jonathan Sanchez
aafcbe9520 Issue #2243 Resolved incorrect import. 
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

Former-commit-id: 714982e96f [formerly 52d7862d36] [formerly c6b6576f01] [formerly fd0f2f1c09 [formerly c6b6576f01 [formerly f79e7820ea010e0bc860b0033183147d7299221f]]]
Former-commit-id: fd0f2f1c09
Former-commit-id: ea268f1966644425a392151655f4081fa9cf6ad5 [formerly 70bb266da7]
Former-commit-id: 7189057682
 2013-08-13 20:47:49 -05:00
Nate Jensen
dde8a77452 Issue #2262 create new wxmath plugin seeded by Java derivparam functions 
Change-Id: If71c205a88ef17a2432267956bd05b9b10a56aa2

Former-commit-id: 9df41ff246 [formerly 23fe237b7e] [formerly 09872d6713] [formerly 959b50d184 [formerly 09872d6713 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]]
Former-commit-id: 959b50d184
Former-commit-id: 51c4ef63ff05fff6b408532bd09a5c1ae80588a3 [formerly 44ef756627]
Former-commit-id: aaee338f5c
 2013-08-13 16:59:57 -05:00
Richard Peter
0c915ec5dc Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1 
Former-commit-id: 4dd1b27e44 [formerly 2b23cb871e] [formerly 6efc27c1b1] [formerly d5130432a8 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]]
Former-commit-id: d5130432a8
Former-commit-id: 2a26f47bc2eef0af172637a67f611d6028ddb875 [formerly 2fc754b899]
Former-commit-id: e28de494e9
 2013-08-13 16:45:37 -05:00
Jonathan Sanchez
3806121231 Issue #2243 Fixed update list bugs. 
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly 49f488a58f [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]
Former-commit-id: 49f488a58f
Former-commit-id: dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b]
Former-commit-id: d33332bd58
 2013-08-13 16:30:05 -05:00
Greg Armendariz
23c92a0580 Merge "Issue #2164 - fix 13.6.1 build" into development 
Former-commit-id: 0e4fb54616 [formerly 8bcfc737e6] [formerly 34b428b5a0] [formerly 84413bd66f [formerly 34b428b5a0 [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]
Former-commit-id: 84413bd66f
Former-commit-id: f27556222bac4d9edcd174ff7f0a255be940034e [formerly dbae6131cb]
Former-commit-id: 02dfe84d31
 2013-08-13 12:34:04 -05:00
Nate Jensen
e63e7120e5 Issue #2197 cherry picking 2197 into 13.5 
Change-Id: Ic4c5447a39923252b73930ac1577bf63258ae56f

Conflicts:

	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResourceData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java


Former-commit-id: 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 63b2fe798a [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]
Former-commit-id: 63b2fe798a
Former-commit-id: 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8]
Former-commit-id: 464a104dc1
 2013-08-13 12:27:02 -05:00
Bryan Kowal
ac9f30c364 Issue #2164 - fix 13.6.1 build 
Former-commit-id: 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 586b7646f0 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]
Former-commit-id: 586b7646f0
Former-commit-id: 35049ac07bfb3bc55f39b499e9526b76e59c3cf0 [formerly 8b3827c745]
Former-commit-id: d96ca6737c
 2013-08-13 11:13:52 -05:00
Nate Jensen
766da72c20 Issue #2142 removing more dependencies on edex.common 
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: 5e24a11e06 [formerly 78256fd891] [formerly df95db8f78] [formerly 0c92461c65 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]]
Former-commit-id: 0c92461c65
Former-commit-id: 19ebf5cd40eb632cc1ff7e301922bcea379b8369 [formerly bf821fdbe0]
Former-commit-id: 988ac46c2b
 2013-08-13 09:09:05 -05:00
Nate Jensen
6d5db1a0ef Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development 
Former-commit-id: 9424d4d05e [formerly 9e283f0640] [formerly bb955e6ee7] [formerly e6fc534b8c [formerly bb955e6ee7 [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]]
Former-commit-id: e6fc534b8c
Former-commit-id: a3cf360d5a76db93070e8919ea77aed528d12fca [formerly ea4355e018]
Former-commit-id: c370d3b7d0
 2013-08-13 08:58:50 -05:00
Nate Jensen
b4d5ba2d2c Merge "Issue #2033 Fixed alertviz startup" into development 
Former-commit-id: 74a6174e78 [formerly 5b3334b2ff] [formerly 58e7b31de9] [formerly c62139c327 [formerly 58e7b31de9 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]]
Former-commit-id: c62139c327
Former-commit-id: 0e55127933254744d7ac69d6ba3078acd0ce5ab4 [formerly 95010dbbf4]
Former-commit-id: d9e4590947
 2013-08-13 08:56:24 -05:00
Nate Jensen
d037198231 Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development 
Former-commit-id: 7bbc2ec7d7 [formerly ce20de02a7] [formerly 5948ebca87] [formerly 8101c961d4 [formerly 5948ebca87 [formerly e9e46b68652caff85b2206180856654876f55f12]]]
Former-commit-id: 8101c961d4
Former-commit-id: e0c53384ed3969b5434ffaf4846c3219ee84cc83 [formerly 75f31b372e]
Former-commit-id: 835516348f
 2013-08-13 08:56:01 -05:00
Max Schenkelberg
971c4d5184 Issue #2033 Fixed alertviz startup 
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5

Former-commit-id: 7598c95fd9 [formerly c825e2f0e2] [formerly 49381ac481] [formerly 3f35c335c9 [formerly 49381ac481 [formerly 1cdd5eab835f2df85f8ebc82d0bea79bca3977da]]]
Former-commit-id: 3f35c335c9
Former-commit-id: afbfb22a6fac492f6776c223cc090e8fa76b92f2 [formerly 17a28bf292]
Former-commit-id: c34cc88aa8
 2013-08-12 17:37:15 -05:00
Nate Jensen
342649b95b Issue #2142 more removing of dependencies from common plugins to edex.common 
Change-Id: I3ccb07227ef6adef233898e7fae6678ea4d18c7f

Former-commit-id: c137e92198 [formerly 23802cfe02] [formerly 28c79d0a56] [formerly c2bf2163d9 [formerly 28c79d0a56 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]]
Former-commit-id: c2bf2163d9
Former-commit-id: 80525ffd198786b7cfb596c35ca6de95bc0f8008 [formerly 018845db8f]
Former-commit-id: 2117ec71c6
 2013-08-12 15:41:39 -05:00
Roger Ferrel
3ff13b5a3a Issue #2224 Changes to have DataSet in configuration. 
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: d6bebdca540bfacd287d4ffd9f21c25794c91d4f [formerly 3d9be94e7e]
Former-commit-id: 8884343d89
 2013-08-12 12:50:12 -05:00