Commit graph

2031 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Nate Jensen
a622ae7987 Issue #1561 more efficient query of GFE files
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9

Former-commit-id: 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 86d32ce3e0 [formerly 04e78d5a64] [formerly cdfea29b16] [formerly 5c7dc36583 [formerly cdfea29b16 [formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]]]
Former-commit-id: 5c7dc36583
Former-commit-id: 071380df2d [formerly e99fd427ec] [formerly c8ded44555418c15296b5bf17e62b4980ac6d12e [formerly d520081243]]
Former-commit-id: 07b9fe4aeb28740ffd1e7dc10cbe59d3487236df [formerly f8bd55d407]
Former-commit-id: 527da593d3
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
ab72e2c8e6 Issue #2235 Added Caching version of TopoQuery.
Change-Id: I0e17028921faa40e85134c79074655900bd8358c

Former-commit-id: fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly fb3a11161a [formerly f9cd8457bc] [formerly 2ecba23bb9] [formerly 2a51ddd697 [formerly 2ecba23bb9 [formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]]]
Former-commit-id: 2a51ddd697
Former-commit-id: 4a92feba62 [formerly 794d41a8f7] [formerly 77c845fde31945d0fea149cfd3d18a9817475c57 [formerly 15ddd45995]]
Former-commit-id: e71b70c57b2cf0a04f5c2c818aac7f6dfc5e753c [formerly 16c0832b4f]
Former-commit-id: 7a597c7223
2013-08-06 18:27:21 -05:00
Nate Jensen
6747586438 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 9c6c35e033 [formerly 04d55ac1c0] [formerly 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]]
Former-commit-id: 77dc1df5e9af04c402774c681981e485f8b8553d [formerly 22861240c8]
Former-commit-id: 077c619bbf
2013-08-06 17:17:53 -05:00
Nate Jensen
e5b50e9c0b Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
Former-commit-id: 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly 746a96fd40 [formerly fb6b9a8b42] [formerly 0bf9eed643] [formerly e7949c04ad [formerly 0bf9eed643 [formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]]]
Former-commit-id: e7949c04ad
Former-commit-id: 4fe731ccdb [formerly a321310dd8] [formerly ff0fd5a9b04f0b8a202951409f834a7e581a8e3e [formerly 2bd358ff19]]
Former-commit-id: bcab5ba27caaadf0ca232a80e42f7fbc2e7c1aa1 [formerly 5c3310851b]
Former-commit-id: 94d44a672a
2013-08-06 14:14:27 -05:00
Richard Peter
75d0a7d7f8 Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
Former-commit-id: d6daa8baf3 [formerly 87ecd93a4b] [formerly d6041529db] [formerly d6daa8baf3 [formerly 87ecd93a4b] [formerly d6041529db] [formerly 301556213a [formerly d6041529db [formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]]]
Former-commit-id: 301556213a
Former-commit-id: fda76ba0ee [formerly 9909443fdb] [formerly 1593a636ef6ed60894e574a47d06015f69c4d8a7 [formerly 5349f48a34]]
Former-commit-id: 6a96b3e9ef5e26f76fb3d46b23f816e28d1e7e03 [formerly cb58571e5f]
Former-commit-id: 3e7e16a995
2013-08-06 12:46:32 -05:00
Max Schenkelberg
17c77a8cdc Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly a18686135c [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]]
Former-commit-id: a18686135c
Former-commit-id: b5b121032d [formerly 23b6e68e14] [formerly 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a]]
Former-commit-id: 9c925a779c5403a930ff676af34fb0919f7d79fd [formerly 3d5f35d792]
Former-commit-id: a691c86dc0
2013-08-06 12:37:52 -05:00
Nate Jensen
fcd5669325 Issue #2142 fix logback config
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998

Former-commit-id: 2c4734ce54 [formerly ef55df925d] [formerly 05eba98d50] [formerly 2c4734ce54 [formerly ef55df925d] [formerly 05eba98d50] [formerly 148153eddf [formerly 05eba98d50 [formerly a200e86f382e532c1b60c907b4a0b00d80688917]]]]
Former-commit-id: 148153eddf
Former-commit-id: 38bba7e251 [formerly 119368aec0] [formerly 80b6539a62386b3c8373852e2c99db585c1158d0 [formerly b04d075d18]]
Former-commit-id: cb8b9fe1a9021c3fc7500096a04a7214dac2442c [formerly bcb21350cf]
Former-commit-id: c5c37c9646
2013-08-06 11:39:34 -05:00
Nate Jensen
15684e79a0 Issue #2228 use TMemoryInputTransport for slight efficiency improvement
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 4285a532f2 [formerly 963119e0f3] [formerly d4590cbf5e] [formerly 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]]]
Former-commit-id: 842f15ae12
Former-commit-id: 3d38129cff [formerly 584a17828a] [formerly 7f5e7fbcbc7f70e4221c8002d8b026234f9f46b9 [formerly 7d17d965a3]]
Former-commit-id: 7dd2a02508e2776b9a76cff29cd1c400c61f07d0 [formerly 0abec57d0d]
Former-commit-id: 6585abee8e
2013-08-06 09:52:02 -05:00
Lee Venable
1fd7078aaa Merge "Issue #2143. Changes for non-blocking SCAN dialogs." into development
Former-commit-id: c0e389a4c4 [formerly 89e05a8de1] [formerly a2ae8fe5de] [formerly c0e389a4c4 [formerly 89e05a8de1] [formerly a2ae8fe5de] [formerly 2a74881571 [formerly a2ae8fe5de [formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]]]
Former-commit-id: 2a74881571
Former-commit-id: 132a348b01 [formerly 3e098ce4f4] [formerly 4bb4be0c1640a38f3302cc6d5c848ed37cf6cfd9 [formerly 8f0fa192bb]]
Former-commit-id: bc0b8d458ee282ff72ce9cfb22b7bcc8468b718e [formerly f1b42ae10e]
Former-commit-id: 18dad40473
2013-08-06 09:32:21 -05:00
Nate Jensen
5bd7d9926a Merge "Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source." into development
Former-commit-id: 279472e0d7 [formerly 2319a713ce] [formerly fcb6f59a3f] [formerly 279472e0d7 [formerly 2319a713ce] [formerly fcb6f59a3f] [formerly 28ffe0f3f1 [formerly fcb6f59a3f [formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 8c28596209 [formerly 5c078cd52b] [formerly 7511beab68aac9774e97faec81dcd3682d5dae36 [formerly 51ce39012d]]
Former-commit-id: 9132fdaf34e247be09d7ca7d9dd3afc8cbcd89e9 [formerly 7a045f1d12]
Former-commit-id: 8727d5190c
2013-08-06 08:35:50 -05:00
Max Schenkelberg
dcd752ef2a Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source.
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly 7d88c2a719 [formerly 54fe14b06b] [formerly 474429aaee] [formerly f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]]]
Former-commit-id: f08e2d5edc
Former-commit-id: ebafa449b2 [formerly 541c66a894] [formerly 2a67c02053abdfe27ab400dab9e694161c2fd5f6 [formerly fc60d55637]]
Former-commit-id: da853a3c36419f097b12fdd31666ec8568fe8198 [formerly 71ee818ed0]
Former-commit-id: 424f455607
2013-08-05 16:46:02 -05:00
Roger Ferrel
6440382fb1 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 1b1f1e5fcd [formerly 7ec3980efb] [formerly 19d23ae929] [formerly 1b1f1e5fcd [formerly 7ec3980efb] [formerly 19d23ae929] [formerly b3f9ea79af [formerly 19d23ae929 [formerly 30f55459d26e3d1118610959e98e475ede0e9f47]]]]
Former-commit-id: b3f9ea79af
Former-commit-id: 7762c691f4 [formerly 1989010d06] [formerly dc9bcea79d50c494391552aab4788f40fc1d371c [formerly 2be8799f51]]
Former-commit-id: 1b09fd97c6b1243280d201160cdb152ccfbe869a [formerly 4a8ece9a15]
Former-commit-id: 7a264801f1
2013-08-05 16:20:46 -05:00
Richard Peter
5dcee45780 Merge "Issue #2220 Removed synchronized from most methods." into development
Former-commit-id: 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 89894b6f7d [formerly e0194aa022] [formerly d79c7c1b84] [formerly 084d39c6f3 [formerly d79c7c1b84 [formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]]]
Former-commit-id: 084d39c6f3
Former-commit-id: 858be1c9ac [formerly 05aac96abd] [formerly 7c8d8d740241500fd1596cf042c785f1d1a49abd [formerly b23a59a114]]
Former-commit-id: 4412bf954ff7b36ab4fa1cfedac405fd03980738 [formerly 8eada4e873]
Former-commit-id: 06eff13f05
2013-08-05 14:27:33 -05:00
Ben Steffensmeier
411c2b5b17 Issue #2202 Add edex specific connectivity checking.
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36

Former-commit-id: 8eb1bf8c88 [formerly 54321b4839] [formerly cfd9cb0b7d] [formerly 8eb1bf8c88 [formerly 54321b4839] [formerly cfd9cb0b7d] [formerly fac4cdc131 [formerly cfd9cb0b7d [formerly b8e5323b70db03817c6c750746f29cc550cbc815]]]]
Former-commit-id: fac4cdc131
Former-commit-id: 0b22fe9da3 [formerly b7e7e69acd] [formerly a127f5eb4b93131c2c55736067e9343cd59ea445 [formerly 66ce1a9c68]]
Former-commit-id: 202c41a4257e94127e748af48148d0d9a987e879 [formerly 977e135e17]
Former-commit-id: 7028e9f71f
2013-08-05 11:17:23 -05:00
Slav Korolev
0c37aad6f2 Issue #2143. Changes for non-blocking SCAN dialogs.
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1

Former-commit-id: 2a16bc5f53 [formerly e8a828d675] [formerly 0c0941ad5d] [formerly 2a16bc5f53 [formerly e8a828d675] [formerly 0c0941ad5d] [formerly 4afde7addb [formerly 0c0941ad5d [formerly 5539da3d19fa0c174eba1a8733e946ca10e5f4bb]]]]
Former-commit-id: 4afde7addb
Former-commit-id: f408b65809 [formerly 94150381c5] [formerly ce5f78fe83637b3d4ba5583f6fd0665e41908b2a [formerly 5d180b2e58]]
Former-commit-id: 6ee8169446980c05cde8937cbf979c9f45ce8289 [formerly 2c1a27a76c]
Former-commit-id: f6d25af6ae
2013-08-02 09:53:56 -04:00
Roger Ferrel
aeff9dece3 Issue #2220 Removed synchronized from most methods.
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858

Former-commit-id: 357f17f656 [formerly 825ef1aa02] [formerly 4cdb105622] [formerly 357f17f656 [formerly 825ef1aa02] [formerly 4cdb105622] [formerly 1a66522590 [formerly 4cdb105622 [formerly 6857a74daf7ac43aa76715aff31dfbed04ff0b0b]]]]
Former-commit-id: 1a66522590
Former-commit-id: 1145ef4b82 [formerly 80905446a3] [formerly 597c6decdc07227bd984e1670473cf4ae6c8307f [formerly 51b36a0612]]
Former-commit-id: c92e5252bc06c7906c32023b49f966cfcee5c72f [formerly 9a51923f38]
Former-commit-id: 9d63336b99
2013-08-01 13:46:21 -05:00
Richard Peter
8379ad694f Merge "Issue #2236 Merged Mike's Code" into development
Former-commit-id: 0dfe865802 [formerly 655ec4521d] [formerly 733c4806e8] [formerly 0dfe865802 [formerly 655ec4521d] [formerly 733c4806e8] [formerly 563abed925 [formerly 733c4806e8 [formerly 837c11d7cb97b36751b37c4468ff00b0e261b870]]]]
Former-commit-id: 563abed925
Former-commit-id: 5a17933d7c [formerly c492ced15d] [formerly 32c1296f69d83909b78a2ce694ecbc2805d9d5f7 [formerly 6a6ccaf622]]
Former-commit-id: 8ff65e422e6acd987baf033b361d677ebc103b4f [formerly ad321f41df]
Former-commit-id: df500232bf
2013-07-31 16:33:01 -05:00
Richard Peter
786028bedd Merge "Issue #2220 Implement Archive GUI's recompute sizes." into development
Former-commit-id: 1f1f73e801 [formerly f3a57e9237] [formerly 9acfea6525] [formerly 1f1f73e801 [formerly f3a57e9237] [formerly 9acfea6525] [formerly d1fa0bb7c8 [formerly 9acfea6525 [formerly 080503d71a2b4e40f8ef7985ef01142c2fa29ce0]]]]
Former-commit-id: d1fa0bb7c8
Former-commit-id: 8c3f59f511 [formerly 3796a1ab40] [formerly 5eaa7bfb85ebf386953a48101c99b3c372ec2162 [formerly fe0573a141]]
Former-commit-id: 7de88fa53ef3e2b0e620e205f56847130e4161cf [formerly 67ddc717d4]
Former-commit-id: e08fdb2864
2013-07-31 16:31:24 -05:00
Lee Venable
854612f824 Merge "Issue #2227 fix weird swapping behavior on 4 panel" into development
Former-commit-id: df5c079ae8 [formerly 68018b239c] [formerly c1c97f0a72] [formerly df5c079ae8 [formerly 68018b239c] [formerly c1c97f0a72] [formerly c0d3ef6e8c [formerly c1c97f0a72 [formerly 8313addc8b417aa769264f95f2b22fd65426e88d]]]]
Former-commit-id: c0d3ef6e8c
Former-commit-id: 67546ceaff [formerly a468f3b5db] [formerly 3521c179cc7ac46f52fa5d1fa67d4d4609930681 [formerly 016cd9a487]]
Former-commit-id: 5a9c39eb93e54ea1034330a6a641f063fb2d252c [formerly 22a6dbde4d]
Former-commit-id: 5dde9818b7
2013-07-31 16:29:55 -05:00
Dave Hladky
61dd3901ea Issue #2236 Merged Mike's Code
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6

Former-commit-id: 78766d5567 [formerly 2049a9b4da] [formerly e21cc84d16] [formerly 78766d5567 [formerly 2049a9b4da] [formerly e21cc84d16] [formerly db7c81a1df [formerly e21cc84d16 [formerly 7cc09247bc4166f9586867fba097b4c40577464d]]]]
Former-commit-id: db7c81a1df
Former-commit-id: be1b52c989 [formerly fef2b39123] [formerly 3c1f19617df625bcf1fc232516da55cda0f42bfc [formerly fe9e969142]]
Former-commit-id: e29bf91bafd2f989787cde4e5cd1e78eb502884c [formerly a6bff7d97f]
Former-commit-id: aa099029be
2013-07-31 16:16:47 -05:00
Matt Nash
d3b160619b Issue #2227 fix weird swapping behavior on 4 panel
Change-Id: I87c35349e7aa6b91974f2c8f5edf2531d72a806f

Former-commit-id: 11461bb3f0 [formerly 31f450ccd8] [formerly 341138f01c] [formerly 11461bb3f0 [formerly 31f450ccd8] [formerly 341138f01c] [formerly a4b4177199 [formerly 341138f01c [formerly 83eaaa8e7635c15905f2028dd9f91425bc54826f]]]]
Former-commit-id: a4b4177199
Former-commit-id: 1f94d7806c [formerly cc05c64eac] [formerly fd238b22e28bc7992878216af6a4422a72226198 [formerly 7092cd385b]]
Former-commit-id: a57528a434d95124de6602b25eec212c048c50f0 [formerly c3357ca6d6]
Former-commit-id: 9de64a5fdc
2013-07-31 14:50:42 -05:00