Commit graph

5348 commits

Author SHA1 Message Date
Richard Peter
734eeedd36 Merge "Issue #2859 - Implement redbook MPC NDM menus" into development
Former-commit-id: 14bed8a1df [formerly dc3a698f046599a19beed986c2424c1b8796927e]
Former-commit-id: 7070313c0b
2014-03-20 11:01:08 -05:00
Lee Venable
fae5d96361 Merge "Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level" into development
Former-commit-id: 47f5ec5139 [formerly a5ba903c1500f5e989d9ab6aa80f2521d0653a42]
Former-commit-id: 65335c255d
2014-03-20 10:38:17 -05:00
Nate Jensen
6edec10edc Issue #2919 fix windows error due to gempak library missing
Former-commit-id: 82ee3e7104 [formerly 5a2ba132d9e32ce8a018f35ba2524881e5276120]
Former-commit-id: 747ac58166
2014-03-20 09:38:07 -05:00
David Gillingham
e34f698b1d Issue #2882: Allow null values to be passed back in parameter values for DefaultGeometryData.
Change-Id: I258d247476cf280e107d386b903e9764a492d4f4

Former-commit-id: 0407f5b2e5 [formerly 0e583860b64e9ca856152affe70f62d5f866af4f]
Former-commit-id: d58bb87ee6
2014-03-19 17:28:03 -05:00
Mike Duff
4be30fdc5b Issue #2859 - Implement redbook MPC NDM menus
Change-Id: Ib681435386ea8e4335f5984ddbee2213633cac8e

Former-commit-id: e479bd7055 [formerly 619efadc2230af13707f124534d3caf2fdfaba68]
Former-commit-id: 059ac9c52a
2014-03-19 14:40:00 -05:00
Bryan Kowal
e7c80e9bfd Issue #2929 - the pure Python Override now recognizes REGION as a valid localization level
Amend: use baseline Redmine number

Change-Id: I765c1199e9d8b639e3c87afec41798459f0f92e4

Former-commit-id: 4e320a35a3 [formerly b48eb97e9d270ad49d93f2ca85ceae48da9b9269]
Former-commit-id: 316f9b4747
2014-03-19 14:07:03 -05:00
steve.naples
64b19f2e41 ASM #428 Updated SATPRE file header to correct reftime.
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: 1aa970164f [formerly e51a12ae977528eb85d2c59505ac5be92d945cfe]
Former-commit-id: d0f4df4ad9
2014-03-19 18:16:41 +00:00
Slav Korolev
68a98f4d85 Issue #2652. Fixed issue with edex-text-ingest log.
Former-commit-id: 7ca9607e68 [formerly 62f19ca599740c580973e166e8053ba1c4800178]
Former-commit-id: ef75ea04c0
2014-03-19 11:00:51 -04:00
Lee Venable
12aa173989 Merge "Issue #2433 - Implement view by priority check box menus review comments" into development
Former-commit-id: ab3de987b4 [formerly 27cb84fc6629e94927a4e80cba9586df20805b0a]
Former-commit-id: 96ea26a9a2
2014-03-19 08:54:39 -05:00
Nate Jensen
bc9f494604 Merge "Issue #2895 fixed telestration when leadership returns to a previous leader" into development
Former-commit-id: d44fee0588 [formerly ad4deae1563ea5f311c3428cefb82bf156392310]
Former-commit-id: 3ee42187e6
2014-03-18 17:01:44 -05:00
Mike Duff
9d24291927 Issue #2433 - Implement view by priority check box menus
review comments

Change-Id: I63c984c328336ebe9d6d06dbc48780051e3ea2e7

Former-commit-id: 202a822384 [formerly ca228b57089101c61f9d3f76d7edc4ba96c41b61]
Former-commit-id: a7e568e799
2014-03-18 16:42:58 -05:00
Juliya Dynina
34b6972f79 Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2
Former-commit-id: 7a14dfb5a9 [formerly 8f842b0defba552ebbbe980b42dfb7618a2a7ccd]
Former-commit-id: 9aa170ca5f
2014-03-18 13:52:48 -05:00
Nate Jensen
61c5a25407 Merge "Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common. Peer review comments" into development
Former-commit-id: 7e7745cd7b [formerly 5e03b83061e1cd7f1a15e939c2bc98d3b99cf393]
Former-commit-id: 85e3ac041a
2014-03-18 13:13:53 -05:00
Nate Jensen
68b60eba47 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 2fc1030fad [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]
Former-commit-id: e75d3dfb7c
2014-03-18 12:52:01 -05:00
Nate Jensen
b5f2064207 Merge "Issue #2798 - Fix issue with color not changing for existing user changing site." into development
Former-commit-id: e9be36b08c [formerly 1c87269eac595b61cc54c1e39ec8624ba55fd6d8]
Former-commit-id: 5f79ece006
2014-03-18 12:38:48 -05:00
Mike Duff
ac65a87fe5 Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 7bdef60a55 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]
Former-commit-id: 3d10260065
2014-03-18 11:55:00 -05:00
Mike Duff
26866f4d73 Issue #2855 - Implement HPC menus for NDM, refactor NDM code so more code is common.
Peer review comments

Change-Id: Ie27e8f93d976dcc0573631472986898b3ad8c9ef

Former-commit-id: cb6a3e2cf5 [formerly 29a88687a788305be537ef97cce13e3f45338205]
Former-commit-id: 105a11d8f9
2014-03-18 11:32:28 -05:00
steve.naples
46675eec43 ASM #338 Updated HRAPCoordinates to not parse whitespace
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: 75e8a907fe [formerly 220ef7b1195366834c9f85b828862f128dd3fea1]
Former-commit-id: 309ff4e7f7
2014-03-18 15:40:13 +00:00
Nate Jensen
3d7de2ad9a Merge "Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit" into development
Former-commit-id: 6148c00ed2 [formerly 5b287c87e27e77b07b2f72030bf9e23c72e50912]
Former-commit-id: 6ddf9a2ee7
2014-03-18 09:20:16 -05:00
Nate Jensen
8b83cd83bf Merge "Issue #2904 Nullpointer potential in MesoTabular product." into development
Former-commit-id: 5b948e7214 [formerly 196894dd57fa63f4a6a9dea97fb5fa9f09750a5f]
Former-commit-id: a09714792e
2014-03-18 09:14:17 -05:00
Juliya Dynina
30545f79c5 Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2
Former-commit-id: ef873880b6 [formerly 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0]
Former-commit-id: 85fd3b3888
2014-03-18 08:47:22 -05:00
Juliya Dynina
d6e2b7f741 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2
Former-commit-id: 867f00b438 [formerly 669d66d3b8279833df4a361c961c113e653a542d]
Former-commit-id: c735051e00
2014-03-18 08:13:51 -05:00
David Friedman
fd203b5999 ASM #330 - Fix reloading of TextDB static files
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5

Former-commit-id: decdadce01 [formerly 0a94094f0f140de68da634cbc6c79039507712ca]
Former-commit-id: 15ca9f4dcc
2014-03-18 13:12:40 +00:00
Qinglu.Lin
09e90dfe43 ASM #335 - Watch wording not being inserted for SMW and SMW followup
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: af82143e84 [formerly f114aa5e7348f0feb5d9da66b5cd389dfb21275a]
Former-commit-id: 4b3c821ce0
2014-03-17 18:17:49 -04:00
Steve Harris
5efb16fa8b Merge branch 'omaha_14.2.1' (14.2.1-13) into development
Former-commit-id: 0c2c5ad4bd [formerly a2318f04eea89a258400dea526daa4fe67b69271]
Former-commit-id: d0aeb854f5
2014-03-17 15:55:41 -05:00
Steve Harris
951c9b0d31 Merge branch 'master_14.2.2' into omaha_14.2.2
Former-commit-id: 24fe6a248f [formerly 543090e28936ce680e21cda802cfac73ff31ca58]
Former-commit-id: d087c8c31e
2014-03-17 15:53:31 -05:00
Dave Hladky
b43bd1f861 Issue #2904 Nullpointer potential in MesoTabular product.
Former-commit-id: 373f052de8 [formerly e3139396104ee0d4ffc1dea7fd20782d00eb5ade]
Former-commit-id: 73d8618833
2014-03-17 15:22:42 -05:00
Matthew Howard
30e8d76f50 Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2
Former-commit-id: 1d15cda9fd [formerly 1b46d5c169709a9498a5eb9963286a6223089af4]
Former-commit-id: c1433db0fb
2014-03-14 19:47:32 -05:00
Nate Jensen
b5f3aee368 Issue #2908 attempt to fix build
Change-Id: I4ebcf46021113154ae290ed2a5cc0c76d6aac480

Former-commit-id: 9cf43e7de6 [formerly 131d45e260ab446e9764d0fcc1f542ef012ff352]
Former-commit-id: 78afc6040c
2014-03-14 14:14:37 -05:00
Rici.Yu
c559ade333 ASM #84 - fix default time range for smart tools
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: 58f9857344 [formerly cfb3459d6314afa396c89b90bf42ab539fd15d8c]
Former-commit-id: 74b1c827ee
2014-03-14 14:39:56 -04:00
Brian.Dyke
9f332e938c Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 9c412e444e [formerly 0ea874227f20f9f7fe19fc8371e10711023c3f53]
Former-commit-id: d23acbdd48
2014-03-14 11:13:30 -04:00
Ron Anderson
dcc068132a Issue #2824 Fix possible null pointer when site is deactivated and active table sharing was not enabled.
Change-Id: I2e741e603ade6bbb69ca103006bbcdc213f8acfc

Former-commit-id: 6e6570fd5a [formerly efc59e6541342bfc3e826934e4a9a5d85dc2801b]
Former-commit-id: 883cf26c5f
2014-03-14 10:11:00 -05:00
Brian.Dyke
24a63fb05a Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 30084d7f84 [formerly 39f4506422c590b7520957923a5b00fd16aa19d0]
Former-commit-id: 030a18f804
2014-03-14 10:15:53 -04:00
Brian.Dyke
4e3096631d Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1
Former-commit-id: f999e48df0 [formerly 3605f0373a6ce7b417d942991e50029c2d0c964b]
Former-commit-id: d4b6d22ae2
2014-03-14 08:44:39 -04:00
Brian.Dyke
55918ee421 OB_14.1.1-23 baseline
Former-commit-id: bc6a7bf946 [formerly b3292d88eee345fca27d9ca645ec2686d0114e5c]
Former-commit-id: dcc2e4fd61
2014-03-14 08:18:16 -04:00
Ron Anderson
ef8a3b2581 Issue #2908 Update org.apache.commons.pool to 1.5.4. Change GeoTools to use the separate org.apache.commons projects that are in the baseline.
Change-Id: I05de2eaadc2766a8a0deee6ac816f29119800774

Former-commit-id: 107daf22ae [formerly 60ace911a0b1496d3bb74a85ff3c6b89ca70c267]
Former-commit-id: 0a6630a84d
2014-03-13 18:01:22 -05:00
Bryan Kowal
3e90c26b14 Issue #2851 - jogl plugin fragment for MSFT Windows 64-bit
Former-commit-id: 6ba13b2b44 [formerly 5f0d983aa7cd428d532aa3b418eaddf21e31718a]
Former-commit-id: 9b2af366c1
2014-03-13 17:39:32 -05:00
Kevin P. Johnson
e3a951da78 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: 4c833d3389 [formerly fad7cf2e6661aa0bcc9c37499e0560b708f192f0]
Former-commit-id: b2797a0788
2014-03-13 20:42:12 +00:00
Nate Jensen
727457dd9d Merge "Issue #2718 Fix org.geotools version in common.base.feature/feature.xml" into development
Former-commit-id: 42649882fa [formerly 63bab83be86d4ad70569187e7948c230819f8b7d]
Former-commit-id: 620d9cf832
2014-03-13 12:58:10 -05:00
Ron Anderson
6061100cb0 Issue #2718 Fix org.geotools version in common.base.feature/feature.xml
Change-Id: I2e435e5cc7e3a65c116b3ca3ba3bd4f6c736082d

Former-commit-id: dcb7b9c88f [formerly 98ca1d990e02bd70dacca7c951bf0212f93bdccc]
Former-commit-id: fc7a19bdf6
2014-03-13 12:54:44 -05:00
Nate Jensen
57faf2b7b1 Merge "Issue #2909 Remove useLegacyMergeSort java parameter" into development
Former-commit-id: befff7be3a [formerly a221c18b0195cb5b8dd284c4f3ef1266a8efd999]
Former-commit-id: a2a46becc8
2014-03-13 12:41:14 -05:00
Nate Jensen
692ec623b2 Issue #2907 split edex.redbook plugin into common and edex redbook plugins
Change-Id: If9f56b7891276410d54880387701cf6ff6291ffe

Former-commit-id: cc1cb28eed [formerly 62923fbae80131fab6256923bc32bc46e46940ba]
Former-commit-id: 087307a781
2014-03-13 12:23:35 -05:00
Ron Anderson
f921b5c83b Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: dd8bfdf941 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]
Former-commit-id: d1b36c4a72
2014-03-13 11:54:15 -05:00
Nate Jensen
a9381c505e Merge "Issue #2718 Update to GeoTools 10.5 Undo reformatting of ncep code Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util" into development
Former-commit-id: 27625eb93a [formerly ee5c599bf4822f73e488e42240c5794189e2d70f]
Former-commit-id: 540d0f2e1d
2014-03-13 11:16:00 -05:00
Ron Anderson
ab69d3e318 Issue #2718 Update to GeoTools 10.5
Undo reformatting of ncep code
            Move com.raytheon.edex.common.shapefiles.ShapeFile.java to com.raytheon.edex.plugin.radar.util

Change-Id: I2bdf4d7d08061ace24589dafca26f00bac00aa2a

Former-commit-id: bcfaf40ebf [formerly efc65ad66fc4df90319f821f289e13dc9dbeb3a0]
Former-commit-id: 1c727465ee
2014-03-13 11:11:53 -05:00
Nate Jensen
95fe9da5e2 Merge "Issue #2898 Fix recycling of best res resource." into development
Former-commit-id: 8ac509f37f [formerly 274b83f84f4bdda381c450b0853711564cae65a6]
Former-commit-id: c662bfb938
2014-03-13 10:14:58 -05:00
Ben Steffensmeier
477b2b604a Issue #2898 Fix recycling of best res resource.
Former-commit-id: d115db1a66 [formerly 1693e5e369a199dd2a824815e0c3e638fc7b0be3]
Former-commit-id: 90e464ad0b
2014-03-12 18:05:10 -05:00
Nate Jensen
0e39a89ea3 Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
Former-commit-id: f8180587d4 [formerly b723095f6d5d59b67370c7292f88f339d349993a]
Former-commit-id: 82778ad21b
2014-03-12 16:05:19 -05:00
Nate Jensen
185684ce9b Merge "Issue #2871 Clean up ECMWF bundles." into development
Former-commit-id: 3dd9c9bffb [formerly 86e55d14186870cc44f7d0a81e56f2175c66f1df]
Former-commit-id: 253d19af73
2014-03-12 15:35:21 -05:00
Ben Steffensmeier
e6cd8b3167 Issue #2528 Fix satellite units/style.
Former-commit-id: 75120a09cd [formerly 7e38454a31aa55c606c155a108253c0433ecb517]
Former-commit-id: 77041e5b17
2014-03-12 14:19:49 -05:00