Commit graph

2357 commits

Author SHA1 Message Date
Jonathan Sanchez
04a7a8be95 Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34

Former-commit-id: 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly 6902b263e5 [formerly 78b655fd1f] [formerly 2b849d7003] [formerly bc30396b63 [formerly 2b849d7003 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]]]]
Former-commit-id: bc30396b63
Former-commit-id: 93efe34bc1 [formerly 19853a4b57] [formerly 702fb2f390774821e3e6340fc29892363db3d33d [formerly fca67fb4ca]]
Former-commit-id: 0f4fd7ee29ee416395f4664b305f331228350a64 [formerly dbb60f2c13]
Former-commit-id: a1dc6ac50b
2013-08-15 10:56:37 -05:00
Ron Anderson
69d5f7a845 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 d70ba1184d [formerly 5afcf8bee2] [formerly 2b491f11ad] [formerly ca560e5fc0 [formerly 2b491f11ad [formerly 9f4d6e687d0dae6dd9104fd39c44144c0d7ce174]]]]
Former-commit-id: ca560e5fc0
Former-commit-id: afcfafb027 [formerly 7924115bbc] [formerly 721ef25321b96666b7f8c0e38c59a7d3b652d02c [formerly 86b10cfd4b]]
Former-commit-id: 16137f59d317eeea53ab4d0ab2a61d11ad464e53 [formerly 6ae94c0f65]
Former-commit-id: 6a8381426a
2013-08-15 10:50:57 -05:00
Ben Steffensmeier
a19d136402 Issue #1133 Better error handling for invalid polygons in map resource.
Change-Id: Ib935f3c4fee42dae21eb52adf19ea9e2e9d76442

Former-commit-id: b887dcbe6d [formerly aa08c8af42] [formerly 27594e6808] [formerly b887dcbe6d [formerly aa08c8af42] [formerly 27594e6808] [formerly 7f9bbf3d52 [formerly 27594e6808 [formerly 68f1b06c79639874b94b87e4f4365f1fe36c7bac]]]]
Former-commit-id: 7f9bbf3d52
Former-commit-id: 6b5e7b465b [formerly b970d2ffbb] [formerly 2620f59e4670bcb1f4adcdc1ccc3ccf9e49ea0f2 [formerly 5b51795a18]]
Former-commit-id: a724e50099a376a91cf13129b4d2241cced2d608 [formerly 717b078a6a]
Former-commit-id: 8830b5717f
2013-08-15 10:32:28 -05:00
Richard Peter
175d2fe542 Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly 4dc2cdd1d4 [formerly 8ba6abf642] [formerly 7c03fc955b] [formerly a5383dbfa4 [formerly 7c03fc955b [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]]]]
Former-commit-id: a5383dbfa4
Former-commit-id: 309c524817 [formerly c8ad0e3317] [formerly adf78ace14b85f663608aeb404baf77669836088 [formerly 951bb37cd7]]
Former-commit-id: 125b487f38e49cee304df044315c5a80d119bf32 [formerly 6ebc5d67bd]
Former-commit-id: 0e62a4243e
2013-08-14 15:33:02 -05:00
Richard Peter
e6a36eb12a 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 181df35afc [formerly 1f32ef9c7a] [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 84bef1f2ec [formerly c0b0eef331] [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414 [formerly db7c941f6f]]
Former-commit-id: 45b98e41300d826058702743e6eeb0852aa1ad89 [formerly 9cf5e247ab]
Former-commit-id: 42c78326f1
2013-08-14 15:23:18 -05:00
Richard Peter
f48818579c 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 9ff9054d7e [formerly 2608dfe1d8] [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 28a53c8a33 [formerly 3f65eaf74b] [formerly 4ccbd370354ae0debc8270aa65a8ac1c72bc2ba9 [formerly 58a4aaa080]]
Former-commit-id: 7b21c6b410610be2392c1ea462eebd5eaebc5a75 [formerly 7ca1edf371]
Former-commit-id: a7075027be
2013-08-14 14:29:55 -05:00
Nate Jensen
10a705f87d Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: 9407a5202a [formerly 3b97de573a] [formerly 9776721a46] [formerly 9407a5202a [formerly 3b97de573a] [formerly 9776721a46] [formerly 0947f358b1 [formerly 9776721a46 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]]]
Former-commit-id: 0947f358b1
Former-commit-id: edbd00224d [formerly 49567ae86c] [formerly 4e7d46f90eefa803d5b1de7984747157dee229fb [formerly b1882e2e42]]
Former-commit-id: f7a2c6d6794b20d8612ed1eb38167c5d7fd33c00 [formerly 01ee796921]
Former-commit-id: bc7cbd4aba
2013-08-14 12:55:15 -05:00
Richard Peter
3a2237fcd6 Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: 2169c7ae71 [formerly 72ecb0b995] [formerly cfe449d838] [formerly 2169c7ae71 [formerly 72ecb0b995] [formerly cfe449d838] [formerly 045d3cd618 [formerly cfe449d838 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]]]
Former-commit-id: 045d3cd618
Former-commit-id: 143973d9d0 [formerly f02fc50031] [formerly d416d75ca336101c5ae43270118c2986ff81ec92 [formerly 3f456db0f1]]
Former-commit-id: 334d0c139537590db2522582d16a6782d75e8a10 [formerly f8f31253ce]
Former-commit-id: 6c9e009af6
2013-08-14 10:53:53 -05:00
Mike Duff
bf7bfbb742 Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

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

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

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

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

Former-commit-id: dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly dc2363ffd7 [formerly 8d0ee7f5ca] [formerly d685125b25] [formerly 49f488a58f [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]]]
Former-commit-id: 49f488a58f
Former-commit-id: 3806121231 [formerly d33332bd58] [formerly dd476c502c979c6b882524dd8959a4110265b20f [formerly 96c88ad28b]]
Former-commit-id: 359b6c726ca69372c3a6c6e3771187107c6d2a19 [formerly 721b2c7c04]
Former-commit-id: ba585b9424
2013-08-13 16:30:05 -05:00
Greg Armendariz
09e31f389a Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 0e4fb54616 [formerly 8bcfc737e6] [formerly 34b428b5a0] [formerly 0e4fb54616 [formerly 8bcfc737e6] [formerly 34b428b5a0] [formerly 84413bd66f [formerly 34b428b5a0 [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]]]
Former-commit-id: 84413bd66f
Former-commit-id: 23c92a0580 [formerly 02dfe84d31] [formerly f27556222bac4d9edcd174ff7f0a255be940034e [formerly dbae6131cb]]
Former-commit-id: e8ba020059e20401e83646629621c84cddf4d30a [formerly e5399de2a2]
Former-commit-id: 0995174c2e
2013-08-13 12:34:04 -05:00
Nate Jensen
346e1d1fb7 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 9a01271f5f [formerly a9815b0551] [formerly 15405cab1b] [formerly 63b2fe798a [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]]]
Former-commit-id: 63b2fe798a
Former-commit-id: e63e7120e5 [formerly 464a104dc1] [formerly 63f208510706ceb9b97414afeb3057e182119b34 [formerly 3be446fca8]]
Former-commit-id: 3574b3d0242e822b25fae435b013a4f5730216e4 [formerly 96214e9554]
Former-commit-id: 7e35afdd49
2013-08-13 12:27:02 -05:00
Bryan Kowal
6afd751590 Issue #2164 - fix 13.6.1 build
Former-commit-id: 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 17c4406504 [formerly dbaa6da3ea] [formerly 4604653241] [formerly 586b7646f0 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]]]
Former-commit-id: 586b7646f0
Former-commit-id: ac9f30c364 [formerly d96ca6737c] [formerly 35049ac07bfb3bc55f39b499e9526b76e59c3cf0 [formerly 8b3827c745]]
Former-commit-id: ec9f485bacfdf0d2204f2d81a57a303b83c0ee49 [formerly 64916e1833]
Former-commit-id: 197cc17ce7
2013-08-13 11:13:52 -05:00
Nate Jensen
07c3bdd58b Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

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

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

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

Former-commit-id: 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 09360f30c5 [formerly 705a3482f8] [formerly 1863d4d65b] [formerly 3ecf95b18a [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]]]
Former-commit-id: 3ecf95b18a
Former-commit-id: 3ff13b5a3a [formerly 8884343d89] [formerly d6bebdca540bfacd287d4ffd9f21c25794c91d4f [formerly 3d9be94e7e]]
Former-commit-id: 51ddb755a5783a79e40ea7bc4708a317725db50b [formerly e51bf3559c]
Former-commit-id: 9dd8173991
2013-08-12 12:50:12 -05:00
David Gillingham
1134f407f6 Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338

Former-commit-id: 11384d2198 [formerly ed39a866f0] [formerly 07312fe01f] [formerly 11384d2198 [formerly ed39a866f0] [formerly 07312fe01f] [formerly 98f48e5a64 [formerly 07312fe01f [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]]]
Former-commit-id: 98f48e5a64
Former-commit-id: ef8d1ab050 [formerly ffa45d26d9] [formerly 0527b1c234a834d22bfd7b3815bbcd2f2a5ee8ef [formerly 0b8a48b12e]]
Former-commit-id: 23d77b644b9e924392294d072039d0266bf858c7 [formerly 235df668a6]
Former-commit-id: 98fdc5d1a1
2013-08-12 12:18:02 -05:00
Nate Jensen
30b8856941 Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly d4dbb8fe98 [formerly 81510bc3b7] [formerly 9f0698fe75] [formerly c5b96690ce [formerly 9f0698fe75 [formerly 971df482819466e48efcbc3a1b01eab88687436a]]]]
Former-commit-id: c5b96690ce
Former-commit-id: b886cddc80 [formerly 0261071228] [formerly a8203aeffc85324d517d20a945883c7a079b265e [formerly b18fa88aaf]]
Former-commit-id: ce4493bc39d39b4651d356d7dccccd406b437835 [formerly 1afec6d94d]
Former-commit-id: 2ba81e806a
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
e8923fc949 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly e39f55eeb7 [formerly 7e65ad5fe8] [formerly 479f72bc10] [formerly 9901e7a622 [formerly 479f72bc10 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]]]
Former-commit-id: 9901e7a622
Former-commit-id: 4376d4c066 [formerly 98dab7a5bd] [formerly 9bb59859513212d7b568900c9fea7ec4afdb0e0a [formerly 5071cf2fce]]
Former-commit-id: 21724cc18fe4234e4dfd9b24a7136c0658599635 [formerly 2c2b4c6c41]
Former-commit-id: 23e244e520
2013-08-12 11:37:51 -05:00
Greg Armendariz
8c073c655e Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: 949e3974ef [formerly ab41d0cdb6] [formerly 5ea53e1c0f] [formerly 949e3974ef [formerly ab41d0cdb6] [formerly 5ea53e1c0f] [formerly 487b751143 [formerly 5ea53e1c0f [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]]]
Former-commit-id: 487b751143
Former-commit-id: 99315891ce [formerly 84360a83de] [formerly b1c84fa3b3553a3c0e0d8722e08ad6ea8340df09 [formerly fd306c44bd]]
Former-commit-id: e853ba06748f435e74caa2c9b1350aa8d110c022 [formerly 488ad3b167]
Former-commit-id: 65d727103d
2013-08-12 11:14:03 -05:00
Richard Peter
c4ea5f4964 Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly e61f9667c6 [formerly bb2dfdbcce] [formerly b6c34162c6] [formerly b89bb1e8a0 [formerly b6c34162c6 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]]]
Former-commit-id: b89bb1e8a0
Former-commit-id: 76acb0349e [formerly 6d713faf72] [formerly 5df3d208a95eb5996e46425cd66aab9d4d336f54 [formerly a3895de934]]
Former-commit-id: ca177e3ef17f81e8c3d8ba4ae26293c4378c2104 [formerly f820e819b9]
Former-commit-id: 2608077df4
2013-08-12 11:09:55 -05:00
Nate Jensen
50db03ebae Merge "Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base" into development
Former-commit-id: 5fafd2f64e [formerly ba4ca59667] [formerly 564c26361f] [formerly 5fafd2f64e [formerly ba4ca59667] [formerly 564c26361f] [formerly 2245b2f7a6 [formerly 564c26361f [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]]]
Former-commit-id: 2245b2f7a6
Former-commit-id: d9cf3a6d3f [formerly e82ecb755a] [formerly a5bea3938a36d8f40e4ad78c67ad582ea9a1ec66 [formerly 47e3e698de]]
Former-commit-id: 1a95638984f5e65b52cbad676a4f8a5b780690e7 [formerly 292d9e92a2]
Former-commit-id: 2c1c96016b
2013-08-12 09:49:22 -05:00
Max Schenkelberg
750f71ea98 Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly cb1d5d1c5b [formerly b95a96f4c9] [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: cc6950107f [formerly 4fdb3c8306] [formerly 0d46128ba8af16237227239c716ce61a2bd99042 [formerly 75c95e83ef]]
Former-commit-id: 6330e8d0028065ee6a7110c911ee4f47033f7729 [formerly 2178fac70d]
Former-commit-id: 5167a52b65
2013-08-09 14:24:49 -05:00
David Gillingham
09c19d25ea Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b

Former-commit-id: b498e52510 [formerly beb78ae48d] [formerly 5743aebcbe] [formerly b498e52510 [formerly beb78ae48d] [formerly 5743aebcbe] [formerly 640452837c [formerly 5743aebcbe [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]]]
Former-commit-id: 640452837c
Former-commit-id: eb1b2bda8b [formerly d42ae1701d] [formerly a67e0e6bd7abdc943eb4fe37a1a2d56de8d62a8c [formerly f0fbc3766d]]
Former-commit-id: 3bf5fb1bfb20daf44758c48db5b90f963e042f48 [formerly feb37bc4f1]
Former-commit-id: 969ae1bcf0
2013-08-09 10:48:13 -05:00
Bryan Kowal
c7161d8822 Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now
- Note: VizLauncher and AWIPSII.CAVE are NOT Eclipse projects.


Former-commit-id: 21b835c10b [formerly ff9dd063b9] [formerly b88d324aac] [formerly 21b835c10b [formerly ff9dd063b9] [formerly b88d324aac] [formerly 620fb06773 [formerly b88d324aac [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]]]
Former-commit-id: 620fb06773
Former-commit-id: eb1e753dff [formerly 10af499f87] [formerly 43ba1fbf6a0c585906570bfbeac1fcd89f1ea393 [formerly 083ca82113]]
Former-commit-id: 6fd4741e79b2b0aa06d4558d3c527a5b96c6be7f [formerly 62fd3f947e]
Former-commit-id: d043d52eee
2013-08-08 17:45:58 -05:00
Lee Venable
90c1aec4ca Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly c314bf2092 [formerly ef5a7fb83a] [formerly 69dd7b66fa] [formerly 69645f03dc [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]]]
Former-commit-id: 69645f03dc
Former-commit-id: b46745eebb [formerly 696ee07b3f] [formerly e115b93102485b11368b55772e8726745f744ad8 [formerly d9e82e20fd]]
Former-commit-id: eada16a20c494be474850c2dc84119382e3590d1 [formerly a0e0b81a81]
Former-commit-id: 33177a8711
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
231cedc656 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly 7d34154d2c [formerly 05f49219d3] [formerly 4711226b21] [formerly dad0681ae0 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]]]
Former-commit-id: dad0681ae0
Former-commit-id: 1e64c5d491 [formerly b467d0fd66] [formerly 47e2f4c744287d8c0b4a9cc10d78ee81fa61534a [formerly d068b5d61f]]
Former-commit-id: 8a26fc85e651fdc70a339fe1b11109ae175e19ba [formerly 9be546dab8]
Former-commit-id: 21368ade28
2013-08-08 16:31:35 -05:00
Greg Armendariz
a118b8f70a Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly 154539a4fe [formerly 3cecb178cf] [formerly b08ce25ac8] [formerly ffb2bea8ad [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]]]
Former-commit-id: ffb2bea8ad
Former-commit-id: d4840d3802 [formerly 24dc722be4] [formerly 86468f816c52e90d514c87d790110decf28213ac [formerly 566532c40d]]
Former-commit-id: 510970cf69f7524db648757a728ea8385ea55d47 [formerly 172bc300ca]
Former-commit-id: e51e51c625
2013-08-08 16:24:39 -05:00
Roger Ferrel
2f04e882a1 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly 33e860772d [formerly af8668a4c4] [formerly f167ec49cd] [formerly efed5777e9 [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]]]
Former-commit-id: efed5777e9
Former-commit-id: e402e512c7 [formerly 2dc203ebdf] [formerly 02efe6e352bb2e5531596957581bbb2f825eb545 [formerly 96e6d1f7cc]]
Former-commit-id: 7fa49ce6d07a063864c9406805cfb284f0a053c9 [formerly 6a47c144c7]
Former-commit-id: f283f130ba
2013-08-08 16:15:34 -05:00
Greg Armendariz
b264a9d841 13.5.1-13 baseline
Former-commit-id: 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 429898edc6 [formerly f0b62a22bf] [formerly 29b823fee4] [formerly 5577e686c1 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]]]
Former-commit-id: 5577e686c1
Former-commit-id: 076a0b08ac [formerly 9f2f62427b] [formerly 12247e45609042e5a8e46278311d4b5b7ec9eb9d [formerly 8bfac41add]]
Former-commit-id: e2cd5730bab137f2b61daadd542fa1f16682d2c6 [formerly b66fcc40a5]
Former-commit-id: 0c61b62d24
2013-08-08 17:00:36 -04:00
Nate Jensen
8df28785b7 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly 3b787e12df [formerly cce952c0bc] [formerly a919490d00] [formerly a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]]]
Former-commit-id: a9f5465c99
Former-commit-id: 5e3e8941ec [formerly 71a7b044ae] [formerly 30ae61555b26d85ada7506a3e461b768c8ce506c [formerly fe3adecbc2]]
Former-commit-id: 9c431ff615154e98cd93cec658459caab3db8cbd [formerly 440756a331]
Former-commit-id: 815087f84e
2013-08-08 14:46:52 -05:00
Greg Armendariz
d37c94464b 13.5.1-12 baseline
Former-commit-id: 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly 34e0218b59 [formerly 01d067cff9] [formerly c9898ba8d1] [formerly fe51885ba7 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]]]
Former-commit-id: fe51885ba7
Former-commit-id: 75d1e77f1b [formerly f777a744e5] [formerly cdf25117bf69e350e12772219b241d184999c14d [formerly 9892a1a262]]
Former-commit-id: c31f8384962ae36ae9a33ef84d46aea958522032 [formerly cbf9e42c21]
Former-commit-id: 244bc3ac37
2013-08-08 15:34:01 -04:00
Ron Anderson
1704fd60dc Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: 40af78db23 [formerly a85bfb298b] [formerly b43b05fced] [formerly 40af78db23 [formerly a85bfb298b] [formerly b43b05fced] [formerly 92741fe6dd [formerly b43b05fced [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]]]
Former-commit-id: 92741fe6dd
Former-commit-id: 04f7c60a5f [formerly 6b3788382b] [formerly e19fa9210a5d5b214f8dcd6e1513c37b618ea6a5 [formerly 609a5c4a7c]]
Former-commit-id: 99dfdaa0d919bc72c91a9226767f55423eee3005 [formerly 15a3ac1082]
Former-commit-id: ac87ab52dc
2013-08-08 12:48:40 -05:00
Richard Peter
afd5caa2d6 Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: 85e950e286 [formerly 88a9f32aab] [formerly e412320b39] [formerly 85e950e286 [formerly 88a9f32aab] [formerly e412320b39] [formerly f3ba33a84c [formerly e412320b39 [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]]]
Former-commit-id: f3ba33a84c
Former-commit-id: c9e63f12ce [formerly 0b721ec758] [formerly 8cf8a793dfa267cd23180dc6915209e3881ba9d2 [formerly 22f9c92e4a]]
Former-commit-id: 3774f95add31745f7618b8a4f891858cc63653aa [formerly 191ba3bd98]
Former-commit-id: 78a0252dbd
2013-08-08 09:52:25 -05:00
David Gillingham
f5ed9fa3c6 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly ec00fa0cf8 [formerly 6471edab78] [formerly 20e0f4b756] [formerly f839ef6f3b [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]]]
Former-commit-id: f839ef6f3b
Former-commit-id: 3ec31afc5d [formerly 5f9352cb65] [formerly d665f9bc6ae29833ae4f277da48202baec858dd5 [formerly 616c023369]]
Former-commit-id: 18e571136ecc882716d7770817208f07ca118c73 [formerly 6b03403d65]
Former-commit-id: 651ed92403
2013-08-08 09:41:33 -05:00
Ben Steffensmeier
24ec975f4b Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: fbb18fd8c0 [formerly 6e1c8c7208] [formerly 6c7d1d60a8] [formerly fbb18fd8c0 [formerly 6e1c8c7208] [formerly 6c7d1d60a8] [formerly 1bd7cc1097 [formerly 6c7d1d60a8 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]]]
Former-commit-id: 1bd7cc1097
Former-commit-id: 0e1624674e [formerly ffe256a0eb] [formerly 07461a37261a2ba11cc43808c8bbec41bdc88ca8 [formerly 3071e53e45]]
Former-commit-id: 93580a81f12f05ab330768578ccb1b27af7ad60d [formerly 65e33fdae5]
Former-commit-id: 7762410fa0
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
700a64106c Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 49e1e56ec5 [formerly 49a2b27ab1] [formerly 95c4e2d65d] [formerly 49e1e56ec5 [formerly 49a2b27ab1] [formerly 95c4e2d65d] [formerly 4b705b1436 [formerly 95c4e2d65d [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]]]
Former-commit-id: 4b705b1436
Former-commit-id: 4093a51085 [formerly 1de459b743] [formerly 2a94c93ceb85f295c20443cee1806295f3b7e104 [formerly cdddcac87b]]
Former-commit-id: 6fbce6893e721e8ef8186f8a00946a6f719a08a2 [formerly 2877836f4d]
Former-commit-id: 2056116c16
2013-08-07 17:15:06 -05:00
Nate Jensen
5d607d3cbf Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: 0aab8a628a [formerly 8968389383] [formerly ec01e6e872] [formerly 0aab8a628a [formerly 8968389383] [formerly ec01e6e872] [formerly be9315642b [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]]]
Former-commit-id: be9315642b
Former-commit-id: de5ac0756a [formerly 8cca3c32ac] [formerly 71058eb3f64680175103324660052217c65f2678 [formerly b0f3d536e4]]
Former-commit-id: b4837d2813879922805a2c09fd2460bdd91130d5 [formerly 9d4e00d5d1]
Former-commit-id: d6cbe9b4f5
2013-08-07 16:44:30 -05:00
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
2013-08-07 14:46:30 -05:00
Ron Anderson
80dd123de8 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 17ed074c5e [formerly 896b5333d1] [formerly 216b2a5c86] [formerly 0a9068e6d3 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]]]
Former-commit-id: 0a9068e6d3
Former-commit-id: 441702e186 [formerly 44c10c798d] [formerly 72056a95440f5bfa6c34f417686f4cf38ac5b799 [formerly fcb78e78d3]]
Former-commit-id: a8dc90f1f49e2f344423d55c2c7a0344d1759878 [formerly f8ad742697]
Former-commit-id: ec60977418
2013-08-07 14:05:36 -05:00