Commit graph

2053 commits

Author SHA1 Message Date
Richard Peter
9cf5e247ab 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: 5e5047cc4f [formerly 5e5047cc4f [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]
Former-commit-id: 2a9276c728
Former-commit-id: db7c941f6f
2013-08-14 15:23:18 -05:00
Richard Peter
7ca1edf371 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: c61afa1bfa [formerly c61afa1bfa [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 58a4aaa080
2013-08-14 14:29:55 -05:00
Nate Jensen
01ee796921 Merge "Issue #2033 moved bundles and menu files into corresponding plugins" into development
Former-commit-id: 9776721a46 [formerly 9776721a46 [formerly 34c2b29b569f9179d37c330bc2f8edf5d56edf6c]]
Former-commit-id: 0947f358b1
Former-commit-id: b1882e2e42
2013-08-14 12:55:15 -05:00
Richard Peter
f8f31253ce Merge "Issue #2247 - Fix permission displays in UserAdmin Dialogs" into development
Former-commit-id: cfe449d838 [formerly cfe449d838 [formerly 247b8d0848b7cfcadfe2163938226f20e654a98d]]
Former-commit-id: 045d3cd618
Former-commit-id: 3f456db0f1
2013-08-14 10:53:53 -05:00
Mike Duff
242f34efa9 Issue #2247 - Fix permission displays in UserAdmin Dialogs
Change-Id: I2b5e1a717cd741a38ae48e8df0d429a993d88fe4

Former-commit-id: 097028ec59 [formerly 097028ec59 [formerly ca3499309373b553874e7a89e8f38f30e9b041e6]]
Former-commit-id: e791617acc
Former-commit-id: 081d30db4f
2013-08-14 10:13:05 -05:00
Steve Harris
9ea3f0c215 13.5.1-15 baseline
Former-commit-id: 53e96e21db [formerly 53e96e21db [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]]
Former-commit-id: c6dc1817e7
Former-commit-id: 65beefde58
2013-08-14 10:24:26 -04:00
Max Schenkelberg
961ed891c8 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 5ab8b6e2c6 [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 759ff7bcfd
2013-08-14 09:20:28 -05:00
Steve Harris
0f3ffc3892 13.5.1-14 baseline
Former-commit-id: d695e5debe [formerly d695e5debe [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]]
Former-commit-id: 80e5f7fbd4
Former-commit-id: cd5b1e9e2f
2013-08-14 10:07:41 -04:00
Jonathan Sanchez
77a919a7e8 Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb

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

Former-commit-id: 09872d6713 [formerly 09872d6713 [formerly f3d233aeff8017c521288affd4b5be668c9a890a]]
Former-commit-id: 959b50d184
Former-commit-id: 44ef756627
2013-08-13 16:59:57 -05:00
Richard Peter
6e3624d1a7 Merge "Issue #2243 Fixed update list bugs." into omaha_13.5.1
Former-commit-id: 6efc27c1b1 [formerly 6efc27c1b1 [formerly d7d87eb785c9c5e26a841503ea11fac4461b23b3]]
Former-commit-id: d5130432a8
Former-commit-id: 2fc754b899
2013-08-13 16:45:37 -05:00
Jonathan Sanchez
721b2c7c04 Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f

Former-commit-id: d685125b25 [formerly d685125b25 [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]]
Former-commit-id: 49f488a58f
Former-commit-id: 96c88ad28b
2013-08-13 16:30:05 -05:00
Greg Armendariz
e5399de2a2 Merge "Issue #2164 - fix 13.6.1 build" into development
Former-commit-id: 34b428b5a0 [formerly 34b428b5a0 [formerly aa808c2ef1cbee907fbe910892a2c37fa5b0d45c]]
Former-commit-id: 84413bd66f
Former-commit-id: dbae6131cb
2013-08-13 12:34:04 -05:00
Nate Jensen
96214e9554 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: 15405cab1b [formerly 15405cab1b [formerly 0f66e6b3e5999f5f1f97b74b157838c598110cb2]]
Former-commit-id: 63b2fe798a
Former-commit-id: 3be446fca8
2013-08-13 12:27:02 -05:00
Bryan Kowal
64916e1833 Issue #2164 - fix 13.6.1 build
Former-commit-id: 4604653241 [formerly 4604653241 [formerly 2bd27e20c50a3d9a9786bf2ecea4b7c24a38f371]]
Former-commit-id: 586b7646f0
Former-commit-id: 8b3827c745
2013-08-13 11:13:52 -05:00
Nate Jensen
276f78d5f3 Issue #2142 removing more dependencies on edex.common
Change-Id: I6fa6d1957f6aeee3b22f96164c7da4509b06eaaf

Former-commit-id: df95db8f78 [formerly df95db8f78 [formerly 231c873711159c9a59f0bc4e25e70cc9c989ecc0]]
Former-commit-id: 0c92461c65
Former-commit-id: bf821fdbe0
2013-08-13 09:09:05 -05:00
Nate Jensen
74bf4205cb Merge "Issue #2162: Add performance logging for GFE edit area query evaluation." into development
Former-commit-id: bb955e6ee7 [formerly bb955e6ee7 [formerly 731fb620ed8dec721c1fe4bbc0b55b4e11e1283f]]
Former-commit-id: e6fc534b8c
Former-commit-id: ea4355e018
2013-08-13 08:58:50 -05:00
Nate Jensen
1b0049b36b Merge "Issue #2033 Fixed alertviz startup" into development
Former-commit-id: 58e7b31de9 [formerly 58e7b31de9 [formerly 3312f297f36ab27d9f9fb74d48bf291f60292e5a]]
Former-commit-id: c62139c327
Former-commit-id: 95010dbbf4
2013-08-13 08:56:24 -05:00
Nate Jensen
abbe1e21d0 Merge "Issue #2142 more removing of dependencies from common plugins to edex.common" into development
Former-commit-id: 5948ebca87 [formerly 5948ebca87 [formerly e9e46b68652caff85b2206180856654876f55f12]]
Former-commit-id: 8101c961d4
Former-commit-id: 75f31b372e
2013-08-13 08:56:01 -05:00
Max Schenkelberg
c292d1bdc0 Issue #2033 Fixed alertviz startup
Change-Id: Ife44d6be7fb31660ade005d46d3f376d8ed30ff5

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

Former-commit-id: 28c79d0a56 [formerly 28c79d0a56 [formerly 2342170ce4cf51f12759afa26fc5af46f35c6188]]
Former-commit-id: c2bf2163d9
Former-commit-id: 018845db8f
2013-08-12 15:41:39 -05:00
Roger Ferrel
e51bf3559c Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 1863d4d65b [formerly 1863d4d65b [formerly de48fa389414c87ba557b70a480ce6b45144f4aa]]
Former-commit-id: 3ecf95b18a
Former-commit-id: 3d9be94e7e
2013-08-12 12:50:12 -05:00
David Gillingham
235df668a6 Issue #2162: Add performance logging for GFE edit area query evaluation.
Change-Id: I916750fd00549dc53b1dd645792c04f4f63aa338

Former-commit-id: 07312fe01f [formerly 07312fe01f [formerly 7d24f69078e324c56db448f293d3094df83f5c34]]
Former-commit-id: 98f48e5a64
Former-commit-id: 0b8a48b12e
2013-08-12 12:18:02 -05:00
Nate Jensen
1afec6d94d Merge "Issue #2245 Make all DataTime comparisons consistent. Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d" into development
Former-commit-id: 9f0698fe75 [formerly 9f0698fe75 [formerly 971df482819466e48efcbc3a1b01eab88687436a]]
Former-commit-id: c5b96690ce
Former-commit-id: b18fa88aaf
2013-08-12 12:06:53 -05:00
Ben Steffensmeier
2c2b4c6c41 Issue #2245 Make all DataTime comparisons consistent.
Change-Id: I1d4bc8c75860f948c6780761cc862f2acb25874d

Former-commit-id: 479f72bc10 [formerly 479f72bc10 [formerly b175ec81e61f18b42432e0245cddb953fbc5963f]]
Former-commit-id: 9901e7a622
Former-commit-id: 5071cf2fce
2013-08-12 11:37:51 -05:00
Greg Armendariz
488ad3b167 Merge "Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now" into development
Former-commit-id: 5ea53e1c0f [formerly 5ea53e1c0f [formerly a978af636454b1c1ef5287869de3b91ceac52ee1]]
Former-commit-id: 487b751143
Former-commit-id: fd306c44bd
2013-08-12 11:14:03 -05:00
Richard Peter
f820e819b9 Merge "Issue #2222 Changes to allow display of all selected data." into development
Former-commit-id: b6c34162c6 [formerly b6c34162c6 [formerly 957ff1720c6bc80372c0cdb44b95e628e7dbbdd2]]
Former-commit-id: b89bb1e8a0
Former-commit-id: a3895de934
2013-08-12 11:09:55 -05:00
Nate Jensen
292d9e92a2 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: 564c26361f [formerly 564c26361f [formerly 187dd7ebbada6ef7d2d6cdddd9d9354fc73c0fc8]]
Former-commit-id: 2245b2f7a6
Former-commit-id: 47e3e698de
2013-08-12 09:49:22 -05:00
Max Schenkelberg
2178fac70d 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: 0f3c791120 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]
Former-commit-id: d79cfe8ad1
Former-commit-id: 75c95e83ef
2013-08-09 14:24:49 -05:00
David Gillingham
feb37bc4f1 Issue #1856: Fix HazardRecovery to work in SimulatedTime mode.
Change-Id: I811f9a87ac57c3682f282c45f5b380d7773c805b

Former-commit-id: 5743aebcbe [formerly 5743aebcbe [formerly db77c4ea478fbaaf9a9e1b64d9df008874a71548]]
Former-commit-id: 640452837c
Former-commit-id: f0fbc3766d
2013-08-09 10:48:13 -05:00
Bryan Kowal
62fd3f947e 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: b88d324aac [formerly b88d324aac [formerly a29d3008676c2291c27ceed4e7aad10289a64569]]
Former-commit-id: 620fb06773
Former-commit-id: 083ca82113
2013-08-08 17:45:58 -05:00
Lee Venable
a0e0b81a81 Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: 69dd7b66fa [formerly 69dd7b66fa [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]]
Former-commit-id: 69645f03dc
Former-commit-id: d9e82e20fd
2013-08-08 16:40:59 -05:00
Jonathan Sanchez
9be546dab8 Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e

Former-commit-id: 4711226b21 [formerly 4711226b21 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]]
Former-commit-id: dad0681ae0
Former-commit-id: d068b5d61f
2013-08-08 16:31:35 -05:00
Greg Armendariz
172bc300ca 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: b08ce25ac8 [formerly b08ce25ac8 [formerly d79f0ffacc775ed4dc49bcf35adacf4fded994d3]]
Former-commit-id: ffb2bea8ad
Former-commit-id: 566532c40d
2013-08-08 16:24:39 -05:00
Roger Ferrel
6a47c144c7 Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: f167ec49cd [formerly f167ec49cd [formerly b49c3147991d87c32aba619521502438c11eb8f6]]
Former-commit-id: efed5777e9
Former-commit-id: 96e6d1f7cc
2013-08-08 16:15:34 -05:00
Greg Armendariz
b66fcc40a5 13.5.1-13 baseline
Former-commit-id: 29b823fee4 [formerly 29b823fee4 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]]
Former-commit-id: 5577e686c1
Former-commit-id: 8bfac41add
2013-08-08 17:00:36 -04:00
Nate Jensen
440756a331 Issue #2142 remove more dependencies on edex.common
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: a919490d00 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]
Former-commit-id: a9f5465c99
Former-commit-id: fe3adecbc2
2013-08-08 14:46:52 -05:00
Greg Armendariz
cbf9e42c21 13.5.1-12 baseline
Former-commit-id: c9898ba8d1 [formerly c9898ba8d1 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]]
Former-commit-id: fe51885ba7
Former-commit-id: 9892a1a262
2013-08-08 15:34:01 -04:00
Ron Anderson
15a3ac1082 Merge "Issue #2027 upgrade version of derby" into development
Former-commit-id: b43b05fced [formerly b43b05fced [formerly d3867fbea055fa4b4fac77bc1524c2999db25c23]]
Former-commit-id: 92741fe6dd
Former-commit-id: 609a5c4a7c
2013-08-08 12:48:40 -05:00
Richard Peter
191ba3bd98 Merge "Issue #2077 Revise pixel size calculations. Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7" into development
Former-commit-id: e412320b39 [formerly e412320b39 [formerly ef55eddb22b9f50dc06496502e66ff170c603493]]
Former-commit-id: f3ba33a84c
Former-commit-id: 22f9c92e4a
2013-08-08 09:52:25 -05:00
David Gillingham
6b03403d65 Issue #1842: Fix ETN assignment for products with multiple NEW segments with the same phensig.
Change-Id: Iba28011bafdff9a01e7039ce7a439d84bf473389

Former-commit-id: 20e0f4b756 [formerly 20e0f4b756 [formerly d0e5cbfdc0ddd13a157ecd85a14af904fb52dc35]]
Former-commit-id: f839ef6f3b
Former-commit-id: 616c023369
2013-08-08 09:41:33 -05:00
Ben Steffensmeier
65e33fdae5 Issue #2077 Revise pixel size calculations.
Change-Id: Ib46ed8030a809d3e935bfa8c85b745c3b98e23a7

Former-commit-id: 6c7d1d60a8 [formerly 6c7d1d60a8 [formerly 99fa66319bfe07aa84276bd7f9f0817ed5868798]]
Former-commit-id: 1bd7cc1097
Former-commit-id: 3071e53e45
2013-08-07 18:40:28 -05:00
Ben Steffensmeier
2877836f4d Issue #2235 Fix the build, hopefully.
Change-Id: I09466023c4d15921bc9b86e2d6f0958c1ff83539

Former-commit-id: 95c4e2d65d [formerly 95c4e2d65d [formerly 1545f57a99f47bd8dabb70235914bdaa14025b00]]
Former-commit-id: 4b705b1436
Former-commit-id: cdddcac87b
2013-08-07 17:15:06 -05:00
Nate Jensen
9d4e00d5d1 Issue #2027 upgrade version of derby
Change-Id: Ic84bcde6b411283ce07a4d6d5005e596d4f392c4

Former-commit-id: ec01e6e872 [formerly ec01e6e872 [formerly fe74cd780a74814665121c4ed334829f4a42a0ef]]
Former-commit-id: be9315642b
Former-commit-id: b0f3d536e4
2013-08-07 16:44:30 -05:00
Greg Armendariz
9a1b44efdc Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: ecc9f77f42 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]
Former-commit-id: 6b1989cb29
Former-commit-id: c46f04dd72
2013-08-07 14:46:30 -05:00
Ron Anderson
f8ad742697 Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
Former-commit-id: 216b2a5c86 [formerly 216b2a5c86 [formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]
Former-commit-id: 0a9068e6d3
Former-commit-id: fcb78e78d3
2013-08-07 14:05:36 -05:00
Greg Armendariz
f06ee47260 13.5.1-11 baseline
Former-commit-id: ea7b22500e [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
f37ef8c24e 13.5.1-10 baseline
Former-commit-id: 852455843f [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Nate Jensen
f8bd55d407 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: cdfea29b16 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]
Former-commit-id: 5c7dc36583
Former-commit-id: d520081243
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
16c0832b4f Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: 2ecba23bb9 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]
Former-commit-id: 2a51ddd697
Former-commit-id: 15ddd45995
2013-08-06 18:27:21 -05:00