Commit graph

3560 commits

Author SHA1 Message Date
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
2b9c2a7b3f Merge "Issue #2262 create new wxmath plugin seeded by Java derivparam functions" into development
Former-commit-id: e4a9195477 [formerly e4a9195477 [formerly 5b909886e84f0f6942a06367f223940e4448e315]]
Former-commit-id: c844396230
Former-commit-id: ffed8deab6
2013-08-13 17:19:25 -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
Roger Ferrel
0df3bdb780 Issue #2224 Quick for daily build until I figure out what is really wrong.
Change-Id: I589b04aae265239dc2cb2e34819ff28eb2ced8d6

Former-commit-id: f4d6bf5ff3 [formerly f4d6bf5ff3 [formerly 261e40897b011ea7f0aec668d57b65631a6c735f]]
Former-commit-id: ea862ea395
Former-commit-id: 05d0a371e2
2013-08-13 16:03:50 -05:00
Mike Duff
420025ae77 Issue #2263 - remove build failure on unit test failure
Change-Id: I921470904bf894cf49c7952b6c5feba3caf5b83f

Former-commit-id: 367420ad48 [formerly 367420ad48 [formerly 57870e24ca02e1cb66705cac79fb8856685a56b3]]
Former-commit-id: 62c3e2107f
Former-commit-id: cac7a8d0da
2013-08-13 14:54:24 -05:00
Nate Jensen
087658d413 Merge "Issue #2253 fix issue where warnings do not show up in the drop down in Warngen" into development
Former-commit-id: f8d8e312f3 [formerly f8d8e312f3 [formerly 32053b62812fc375aebb5af21af1149b2b4944c5]]
Former-commit-id: d995e29afe
Former-commit-id: 759348ba2e
2013-08-13 12:34:44 -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
f8dc20caba Merge "Issue #2142 removing more dependencies on edex.common" into development
Former-commit-id: 260ea8a0b9 [formerly 260ea8a0b9 [formerly 725b2654ce507b302ac111a740f27460799ecd80]]
Former-commit-id: 576b8fa830
Former-commit-id: 295b29860b
2013-08-13 12:32:09 -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
Matt Nash
82214b871e Issue #2253 fix issue where warnings do not show up in the drop down in Warngen
Change-Id: I680948f5e5224da9f649632fd72ca0412eb9b186

Former-commit-id: 5aeda85fca [formerly 5aeda85fca [formerly 1c72a8cfeeb9263f8d406002de9703a1ee73f40e]]
Former-commit-id: dda3d78b48
Former-commit-id: ebb291e6c3
2013-08-13 11:59:35 -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
Richard Peter
c14c5c3b15 Merge "Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals." into development
Former-commit-id: 3f6d8a28da [formerly 3f6d8a28da [formerly c4cc04a6b759f934a556004a242da4dfa4709653]]
Former-commit-id: 60831564a0
Former-commit-id: a4d9a82ca5
2013-08-13 10:10:07 -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
Richard Peter
96336e3fa3 Merge "Issue #2224 Changes to have DataSet in configuration." into development
Former-commit-id: d8124958b5 [formerly d8124958b5 [formerly d4a46b8283ac0cb47f62c43b999d7f119161e08d]]
Former-commit-id: 2de533cbbf
Former-commit-id: 4605595354
2013-08-12 15:01:51 -05:00
Nate Jensen
5b096c5524 Merge "Issue #2142 remove some uf.common dependencies on edex.common" into development
Former-commit-id: 82472058e9 [formerly 82472058e9 [formerly 9e3b68a2e0ed6dcc63c5d2cace84c0fa3cadb521]]
Former-commit-id: de38280317
Former-commit-id: f6c4ec164f
2013-08-12 14:16:29 -05:00
Ben Steffensmeier
bf58a91f2d Issue #2245 make DataTimeCompatible Java 6 compatible.
Former-commit-id: 67c84f2fb8 [formerly 67c84f2fb8 [formerly e32655d3daef131c451d972c7b2747b01e49d840]]
Former-commit-id: 46c3413805
Former-commit-id: 64b1d5d9dd
2013-08-12 13:43:43 -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
Nate Jensen
4bb302cd5c Issue #2142 remove some uf.common dependencies on edex.common
Change-Id: I327d9c6a184c2a9b422c02a39a2268459775a887

Former-commit-id: 94096b8f65 [formerly 94096b8f65 [formerly c0c65319cd731aea51f730f700b0fda3c6992d38]]
Former-commit-id: 48758e64ef
Former-commit-id: ce0c8f3259
2013-08-12 12:47:51 -05:00
Greg Armendariz
84e38e55c7 Merge "Issue #2254 - Fix the nightly automated junit tests" into development
Former-commit-id: 1386598257 [formerly 1386598257 [formerly 347fe4615e9902892a95f13d13cfd8c0bcd7c39d]]
Former-commit-id: 594198b5a5
Former-commit-id: 3c0c7ee56b
2013-08-12 12:25:17 -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
Mike Duff
93ce81f949 Issue #2254 - Fix the nightly automated junit tests
Change-Id: I8e595c097682ddd01cebf23fedbe5380d078085a

Former-commit-id: 9558b20e7c [formerly 9558b20e7c [formerly 96eddd84c4f1287fa56e5356831961209c76331a]]
Former-commit-id: 832e61f938
Former-commit-id: 7b36ba1a19
2013-08-12 09:25:21 -05:00
Brad Gonzales
e642fb330f Issue #1822 created DataDeliveryRetrievalWmoHeaderApplier to generate WMO Header for data delivery retrievals.
Change-Id: If1037781d8fbf0e3a88556ef4401fb77621187d7

Former-commit-id: 21c1b35c8b [formerly 21c1b35c8b [formerly 9ddb76125f51eb0ea73b7bb54a77e84fb32349e4]]
Former-commit-id: d5ee61dc2b
Former-commit-id: 780062acf3
2013-08-09 15:42:38 -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
Ben Steffensmeier
b5332f3eb5 Issue #1869 Fix bufrua point data stationId.
Former-commit-id: 9e799b4df1 [formerly 9e799b4df1 [formerly 63146c966143e4690da0f7979a3fe217d5c6caa0]]
Former-commit-id: d1d3491aaf
Former-commit-id: 761cb47f73
2013-08-09 13:00:18 -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
e5727ed745 Issue #2252 - remove file accidentally re-added by the merge.
Former-commit-id: 3bdbf6d0cc [formerly 3bdbf6d0cc [formerly 0462ccb18fdd17b2d25a2c22b547d052ffe33aca]]
Former-commit-id: 5c6258e8c1
Former-commit-id: a35cbbf85c
2013-08-08 18:38:21 -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