Roger Ferrel
|
265af3e434
|
Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081
Former-commit-id: f0d45736b0 [formerly 2209d4d650] [formerly e3ae2eb355] [formerly e3ae2eb355 [formerly 22f8bc10f0]] [formerly f0d45736b0 [formerly 2209d4d650] [formerly e3ae2eb355] [formerly e3ae2eb355 [formerly 22f8bc10f0]] [formerly 4c3af2a258 [formerly e3ae2eb355 [formerly 22f8bc10f0] [formerly 4c3af2a258 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]]]]]
Former-commit-id: 4c3af2a258
Former-commit-id: e8bc243785 [formerly af8fa780d2] [formerly c1c0e53b2d] [formerly 4a0332571c7e97fdb49ed56b6c7683c90d76face [formerly 1c4ed8e46fd206b5fb6dfee23125c65e6807a1ec] [formerly c1c0e53b2d [formerly 8e85e1c8df]]]
Former-commit-id: 854c8f921a57af5fac3d7943765e39a16a0df971 [formerly e264bdded33ddcea6a27100220ede625d7040a4f] [formerly 046da0519b [formerly 1b582e49a6]]
Former-commit-id: 7baf242f6355e6104e437ba6645f80e9eb1623c9 [formerly 046da0519b]
Former-commit-id: 909a8285d0
|
2012-11-13 12:55:33 -06:00 |
|
Ron Anderson
|
c9af4ef630
|
Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 74bc7dd511 [formerly dbc5a5bb97] [formerly 1bb7258935] [formerly 1bb7258935 [formerly 8a5a2dc532]] [formerly 74bc7dd511 [formerly dbc5a5bb97] [formerly 1bb7258935] [formerly 1bb7258935 [formerly 8a5a2dc532]] [formerly 795dfdc9dd [formerly 1bb7258935 [formerly 8a5a2dc532] [formerly 795dfdc9dd [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]]]]
Former-commit-id: 795dfdc9dd
Former-commit-id: b8b856e167 [formerly 88e7d313c4] [formerly d6a33fb39f] [formerly b997d9c0f61d52f183a6c0aa69ae191e18fe6ff6 [formerly 20e198ff53cca6785546ec870a4e207bdb8ddfbc] [formerly d6a33fb39f [formerly bad09a9c0d]]]
Former-commit-id: 72f86baeeb0af0d6b48d23e76e22da324e1fba91 [formerly 3b9d5c03dba338511c7106110cef946f3ebdfc75] [formerly 6bf06bf78f [formerly dc6b83dccc]]
Former-commit-id: 6bf06bf78f
Former-commit-id: ae896a9da2
|
2012-11-13 12:06:54 -06:00 |
|
Mike Duff
|
f38dbb9dfa
|
Issue #1317 - Fix problem in edexProcessStats.xml
Change-Id: I6fc99ac9447b47101ca6f8e7acec705dd7235e03
Former-commit-id: e15540cab5 [formerly 24aa44a46d] [formerly 248db814c1] [formerly 248db814c1 [formerly 0e32ab85db]] [formerly e15540cab5 [formerly 24aa44a46d] [formerly 248db814c1] [formerly 248db814c1 [formerly 0e32ab85db]] [formerly e14b372f42 [formerly 248db814c1 [formerly 0e32ab85db] [formerly e14b372f42 [formerly 756c1b6b22cdf91c44f4bb1ec75dca8bb8074eef]]]]]
Former-commit-id: e14b372f42
Former-commit-id: 7d728d4bab [formerly 5aadd96ae5] [formerly b91dca252e] [formerly 7ab65cfbccd6e1c0337d2098fc8f45a1ec99a79a [formerly 965fd4a7f301467fa40bb5165f739960f012cec8] [formerly b91dca252e [formerly 363aa7bec6]]]
Former-commit-id: 14b145f92dbe48ef92fcca8acf03f8b398e396db [formerly 51bc6f29597e663341c326541b8f01a260c10c5d] [formerly 3eee332949 [formerly 4771bb25ac]]
Former-commit-id: e5a8065a1b99d556f7cd6ce29cbcf094f28a9107 [formerly 3eee332949]
Former-commit-id: 48b3a2fa10
|
2012-11-13 11:44:02 -06:00 |
|
Roger Ferrel
|
32a7cf8605
|
Issue #1298 Changes for non-blocking ZoneColorEditorDlg.
Changes from reviewer's comments.
Change-Id: Ie818637b34649c498e289607ab72ac67f7c8cb6f
Former-commit-id: 0c0604c9fa [formerly e82a2e2d5c] [formerly fdfa0f2030] [formerly fdfa0f2030 [formerly 5ce67ffd9e]] [formerly 0c0604c9fa [formerly e82a2e2d5c] [formerly fdfa0f2030] [formerly fdfa0f2030 [formerly 5ce67ffd9e]] [formerly ae52206cc7 [formerly fdfa0f2030 [formerly 5ce67ffd9e] [formerly ae52206cc7 [formerly 6b6c4e0b61fbc7b51bdef738a4bdee7505fc8ea5]]]]]
Former-commit-id: ae52206cc7
Former-commit-id: 0bc8e5c30d [formerly e4283e3ccd] [formerly 122a5cf0a4] [formerly c2d4e2371ec70412bcbaf1517a3d8bd6a50ecfbc [formerly e30f66c230e0ca09d4cf1ce286c67a28b4b91763] [formerly 122a5cf0a4 [formerly 30c70cc181]]]
Former-commit-id: ced17372a6f393e35fb9c0de3be8fe20735bc07a [formerly 3709ef12351e9d79d8edef04d9bb2919d7e91d9d] [formerly 58dc77407c [formerly d31e866744]]
Former-commit-id: 58dc77407c
Former-commit-id: fa64ad879e
|
2012-11-13 09:49:16 -06:00 |
|
Nate Jensen
|
4087f7b66b
|
Merge "Issue #1324 make times display in 24 hour time" into development
Former-commit-id: a3c4676a49 [formerly dcff3f4711] [formerly ca20259c16] [formerly ca20259c16 [formerly 8a07ba3c11]] [formerly a3c4676a49 [formerly dcff3f4711] [formerly ca20259c16] [formerly ca20259c16 [formerly 8a07ba3c11]] [formerly e7045022ad [formerly ca20259c16 [formerly 8a07ba3c11] [formerly e7045022ad [formerly 40c13a1ca4345f791c9f6f3849fe896ba27a2830]]]]]
Former-commit-id: e7045022ad
Former-commit-id: 4c4a25a204 [formerly e6f79c3e2a] [formerly 2be953df6b] [formerly 15bd66b75df3d0367e6065f116b28853f8d1404e [formerly 0145a91c7598ae528ddbebde30ec8710ab7722e0] [formerly 2be953df6b [formerly 7baf10fc53]]]
Former-commit-id: 25899a6afa530a6ee8c6d42fba10353e83407619 [formerly 5164924ccea10acce2c3ce5e7c8e2be59f6be1d1] [formerly 7be1809e99 [formerly b4bfd19895]]
Former-commit-id: 1f670431e0b4489c02a6117d630c5e2d46788195 [formerly 7be1809e99]
Former-commit-id: 62d2ccbfa8
|
2012-11-13 09:28:05 -06:00 |
|
Ron Anderson
|
83320849c5
|
Merge "Issue #1325 Update GeoTools for WA4.7" into development
Former-commit-id: ea9db600b3 [formerly 2f6d7cc03b] [formerly 8632dfa784] [formerly 8632dfa784 [formerly 024d384292]] [formerly ea9db600b3 [formerly 2f6d7cc03b] [formerly 8632dfa784] [formerly 8632dfa784 [formerly 024d384292]] [formerly 41f68a9cac [formerly 8632dfa784 [formerly 024d384292] [formerly 41f68a9cac [formerly c7fe4cfae35393df26461d4c4892c2bbfaad0fbe]]]]]
Former-commit-id: 41f68a9cac
Former-commit-id: 041d727c0a [formerly ece8bb15e9] [formerly a4d6e197be] [formerly abf15c16839e5acb89ecd785a675f3a8b197ebd2 [formerly 3fe9dfb1515573a495d252408ae0fc1a18702e06] [formerly a4d6e197be [formerly d07cb8c041]]]
Former-commit-id: f1d5c004304662b5ac7ca6d5a4554b393b91478c [formerly ed46b7a754a1d9192cf2db44adadf4f04b0ff18e] [formerly ed9db8384e [formerly e825e032e1]]
Former-commit-id: ed9db8384e
Former-commit-id: cf8cf72f42
|
2012-11-13 09:17:32 -06:00 |
|
Nate Jensen
|
3232a8c224
|
Merge "Issue #1323 initial commit of interfaces of data access framework" into development
Former-commit-id: e06d82ab63 [formerly 73636a68e9] [formerly b43634a58f] [formerly b43634a58f [formerly c2631b5ba6]] [formerly e06d82ab63 [formerly 73636a68e9] [formerly b43634a58f] [formerly b43634a58f [formerly c2631b5ba6]] [formerly ff16f82b18 [formerly b43634a58f [formerly c2631b5ba6] [formerly ff16f82b18 [formerly 68fbcd4c991c6962c27f5aa07b749f0706bfe668]]]]]
Former-commit-id: ff16f82b18
Former-commit-id: 4271ad213c [formerly 6719a66001] [formerly 9170b7f75e] [formerly f8b6bf5670fa3feaf1a439f9919cd03c5759b089 [formerly bdd1ffdd3e03e63afdf42976f2fb37cc88db659c] [formerly 9170b7f75e [formerly 14a139c813]]]
Former-commit-id: 17af5f6f94255544763f0116c6e3a7a91540e392 [formerly 14719f603c1220f9a9fd7977012472ec241180a1] [formerly e99e40f886 [formerly 61beb174fe]]
Former-commit-id: e99e40f886
Former-commit-id: ef31519264
|
2012-11-13 09:01:43 -06:00 |
|
Nate Jensen
|
a9eb7145c4
|
Merge "Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels." into development
Former-commit-id: fc350cdc87 [formerly 35ea1b7773] [formerly 254e88a70c] [formerly 254e88a70c [formerly 8a1f3a10a4]] [formerly fc350cdc87 [formerly 35ea1b7773] [formerly 254e88a70c] [formerly 254e88a70c [formerly 8a1f3a10a4]] [formerly e51d86ce3a [formerly 254e88a70c [formerly 8a1f3a10a4] [formerly e51d86ce3a [formerly ef3483e14907e044a66cb6c5c677b6794bf9b03a]]]]]
Former-commit-id: e51d86ce3a
Former-commit-id: 19bb04ae4d [formerly 826c997e0b] [formerly 14b61ef0f8] [formerly fc868817831b21538593e5c4ac76dfeeb98c2cb3 [formerly 41eca00d43f0977ae5f16683be5bae42fb520906] [formerly 14b61ef0f8 [formerly cf8fd9f731]]]
Former-commit-id: 39b75202451560a24c4716094d2e200722a54b9f [formerly b90abea64ee950c05accfd4ff636e4e81d7537dd] [formerly 0f982fbf32 [formerly d94afa6a55]]
Former-commit-id: 0f982fbf32
Former-commit-id: 6c6feff5ab
|
2012-11-12 17:16:07 -06:00 |
|
Lee Venable
|
260318a7ba
|
Merge "Issue #1298 Changes for non-blocking WrapLengthDialog. Changes from reviewer's comments. Fix merge conflict." into development
Former-commit-id: b0a7530a8a [formerly ca88126428] [formerly e62c2fb732] [formerly e62c2fb732 [formerly a576274c3c]] [formerly b0a7530a8a [formerly ca88126428] [formerly e62c2fb732] [formerly e62c2fb732 [formerly a576274c3c]] [formerly d4276e6474 [formerly e62c2fb732 [formerly a576274c3c] [formerly d4276e6474 [formerly 46fbeba87efbee0b558fdd2c8f7e8c5abf004ac5]]]]]
Former-commit-id: d4276e6474
Former-commit-id: ca1eade9b1 [formerly 70142d8fa5] [formerly eaf7e7c724] [formerly cee4908d4373c7a75ce12baf9c4e353095f5afef [formerly dfb666f53c8640e84e9243b56e5e8a82310819b7] [formerly eaf7e7c724 [formerly fb4b76b003]]]
Former-commit-id: d64ca8bebd21198c38eb5cc4b07012b4fc24e004 [formerly 6ad648ee3c192704b4ec913645fb0df7af756b2e] [formerly e383520c28 [formerly 85b200a973]]
Former-commit-id: e383520c28
Former-commit-id: 65d9170e0d
|
2012-11-12 16:58:17 -06:00 |
|
Max Schenkelberg
|
616e74a3e2
|
Issue #1308 removed activemq references in spring file, made gfe common xml explicitly depend on time xml
Change-Id: I784b077d1ab2d929ddad1cb69fccc4a8c5e0729e
Former-commit-id: 0b6086690c [formerly 1ed5f10230] [formerly 30c1802398] [formerly 30c1802398 [formerly d1099addc6]] [formerly 0b6086690c [formerly 1ed5f10230] [formerly 30c1802398] [formerly 30c1802398 [formerly d1099addc6]] [formerly 00822a4f39 [formerly 30c1802398 [formerly d1099addc6] [formerly 00822a4f39 [formerly e696b81840b6c1f0a0df8a9f20b859f23bc5a3e7]]]]]
Former-commit-id: 00822a4f39
Former-commit-id: 9f2ea0546b [formerly 25f5a9b1aa] [formerly 4408af827f] [formerly a7b29e84f243af45051d4f8a22fc390ac9697128 [formerly 5eaaf2b42110ba677fab87f22b62f6cd269072be] [formerly 4408af827f [formerly c4e5092f94]]]
Former-commit-id: da721c71737e322a9a62cdbfcd7bff9c3a8bf064 [formerly ce52baa9c7936da99037dab8b484c380e17a0b39] [formerly c6b516ff9e [formerly 9a13824af2]]
Former-commit-id: c6b516ff9e
Former-commit-id: 9de9bb8cb1
|
2012-11-12 16:46:21 -06:00 |
|
Nate Jensen
|
5877fc87e2
|
Issue #1323 initial commit of interfaces of data access framework
Change-Id: I301d94a85a4e86550cd409bc17ef94ea3fdd6e02
Former-commit-id: 3a108da7dd [formerly d7f7152e93] [formerly b24c9eb456] [formerly b24c9eb456 [formerly f255f65b3c]] [formerly 3a108da7dd [formerly d7f7152e93] [formerly b24c9eb456] [formerly b24c9eb456 [formerly f255f65b3c]] [formerly bf72e29752 [formerly b24c9eb456 [formerly f255f65b3c] [formerly bf72e29752 [formerly d6b63788ef2af3da474a0d3affcafdddec3690a5]]]]]
Former-commit-id: bf72e29752
Former-commit-id: c8948b0917 [formerly 6d3beb139e] [formerly cfed9d9664] [formerly aaa1ce5e9b7edfd327399492eddafe0aabba90d3 [formerly 321cb3de1f60b624ae9aad5c85b473334d3d249e] [formerly cfed9d9664 [formerly 78a1185b19]]]
Former-commit-id: abaad8073b7f6183416173da6f288a5a2f013334 [formerly 614aba708193784746c4469f65a0cc453381e39b] [formerly 7fce83f574 [formerly 5b837a1b13]]
Former-commit-id: 7fce83f574
Former-commit-id: 7a6797dd62
|
2012-11-12 16:45:33 -06:00 |
|
Ben Steffensmeier
|
298f9a3521
|
Issue #189 modify upgrade script to work with grid resources within bestRes.
Former-commit-id: cd4f77f654 [formerly 0b3639a6fc] [formerly 4a75a9ef3b] [formerly 4a75a9ef3b [formerly 9c17cd2039]] [formerly cd4f77f654 [formerly 0b3639a6fc] [formerly 4a75a9ef3b] [formerly 4a75a9ef3b [formerly 9c17cd2039]] [formerly 8d2a0d4b16 [formerly 4a75a9ef3b [formerly 9c17cd2039] [formerly 8d2a0d4b16 [formerly 784af5833dd3f7514fee15451482cbe7645cef85]]]]]
Former-commit-id: 8d2a0d4b16
Former-commit-id: 9b674c3013 [formerly f4aeb4f521] [formerly d8d2e18a74] [formerly cddb1e2733b7269854ab21326ab1e111408096ec [formerly ce92ae2ccb454a7d440f28759388c4c969a410e1] [formerly d8d2e18a74 [formerly ff9becd710]]]
Former-commit-id: 7c875f86a0ea90780fad458bc8f28980436a52cd [formerly 7b4d403d6c650e149b85fac7f35fac6f235537ee] [formerly 9d9f878553 [formerly b77bc6baaa]]
Former-commit-id: 9d9f878553
Former-commit-id: 53ea356746
|
2012-11-12 16:37:28 -06:00 |
|
Roger Ferrel
|
c5305f3d9e
|
Issue #1298 Changes for non-blocking WrapLengthDialog.
Changes from reviewer's comments.
Fix merge conflict.
Change-Id: If31259188ff9fc1c84a02ca11399dd328dd669d4
Former-commit-id: fd0731f0d4 [formerly 5f0a583d86] [formerly ab77dfa758] [formerly ab77dfa758 [formerly 66606f88de]] [formerly fd0731f0d4 [formerly 5f0a583d86] [formerly ab77dfa758] [formerly ab77dfa758 [formerly 66606f88de]] [formerly e982c0f43a [formerly ab77dfa758 [formerly 66606f88de] [formerly e982c0f43a [formerly 50327729d4b0b135cf959a9093dc90a32cf091e6]]]]]
Former-commit-id: e982c0f43a
Former-commit-id: 9a17029b96 [formerly 4f08c126b6] [formerly 3b07bb1ae6] [formerly ea914a8c793a6c77bf78ca47eb6c5ce08e27e815 [formerly bad97768d4ebf7b70752c8307f99e51df3dd9fe0] [formerly 3b07bb1ae6 [formerly de21a3f2ef]]]
Former-commit-id: 2b004993910403b2e452bc5a10bda5b2d657c954 [formerly 2f7bf56cdf35e135b2334c51978e89aa272307ed] [formerly 3bc3bf17fd [formerly d9c7c4ae56]]
Former-commit-id: 3bc3bf17fd
Former-commit-id: 25370d4e80
|
2012-11-12 16:27:08 -06:00 |
|
Roger Ferrel
|
4ea7d7e875
|
Issue #1298 Changes for non-blocking StoreTransmitDlg.
Changes from reviewer's coments.
Change-Id: I34e111ee2abc8ca154334e9017ea448bfa6fa31f
Former-commit-id: 0f49836379 [formerly e6030885a1] [formerly 13c0fb3f3d] [formerly 13c0fb3f3d [formerly 6445081aa9]] [formerly 0f49836379 [formerly e6030885a1] [formerly 13c0fb3f3d] [formerly 13c0fb3f3d [formerly 6445081aa9]] [formerly 76109f3bf7 [formerly 13c0fb3f3d [formerly 6445081aa9] [formerly 76109f3bf7 [formerly 35e8deb27aecf5c805f0c007e70c45d8cc9988cb]]]]]
Former-commit-id: 76109f3bf7
Former-commit-id: a8fde7543b [formerly 4a8b71a632] [formerly 01899535e3] [formerly 10524989f7e37ef29abed9a705399c8e292a74f3 [formerly d744cdfac526c0ce2d581c461d6fbaafbdfaa2c9] [formerly 01899535e3 [formerly e7cd99ff0d]]]
Former-commit-id: efe08ea6dcc84cfe12244b81928a99b5ee2e9d6f [formerly 87078a296e6b644d33870f062f02c134e7e2f190] [formerly a3608d98fd [formerly 3ebaaa8992]]
Former-commit-id: a3608d98fd
Former-commit-id: 9fe8203d77
|
2012-11-12 15:26:03 -06:00 |
|
Ben Steffensmeier
|
81eff287bc
|
Issue #1108 make ZAGL level deprecated since it is in use in derived parameters, modify derived parameters to handle deprecated master levels.
Former-commit-id: 10e70ca900 [formerly dfe697a59c] [formerly 65441372df] [formerly 65441372df [formerly 7d3f479031]] [formerly 10e70ca900 [formerly dfe697a59c] [formerly 65441372df] [formerly 65441372df [formerly 7d3f479031]] [formerly b5b472dee1 [formerly 65441372df [formerly 7d3f479031] [formerly b5b472dee1 [formerly 2242eefb25cd65edb4378b47b9cafbcab8510c53]]]]]
Former-commit-id: b5b472dee1
Former-commit-id: cfed4b1d62 [formerly 58ba7be711] [formerly 810e0abd77] [formerly 93f78f0f97c1408b65089fc971e9f07d6ba8d8bb [formerly 4bb07970a3378bedd6d8d48f328087592e3c8036] [formerly 810e0abd77 [formerly 220f41ec4c]]]
Former-commit-id: 8e61c2ba1d1fa79fc719bd9b25aab56278790ce2 [formerly 223e4373f81b95cb6e11301886a243f1b7c34c53] [formerly 19f9437de6 [formerly 94d44ed440]]
Former-commit-id: 19f9437de6
Former-commit-id: e93dcd17d2
|
2012-11-12 15:15:49 -06:00 |
|
Ron Anderson
|
4c24d058c8
|
Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: 1659753498 [formerly e7cd1f9def] [formerly 7aaf4db2dc] [formerly 7aaf4db2dc [formerly f709ab812a]] [formerly 1659753498 [formerly e7cd1f9def] [formerly 7aaf4db2dc] [formerly 7aaf4db2dc [formerly f709ab812a]] [formerly 303994ff1b [formerly 7aaf4db2dc [formerly f709ab812a] [formerly 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]]]]
Former-commit-id: 303994ff1b
Former-commit-id: 81f6e0de1d [formerly 366df432bc] [formerly 3ae270a65d] [formerly 72151392a62cc62bce7240c17c89c7b9c68b11ee [formerly eb6052e7b3aef0480bd8fd7500f4d915b645104c] [formerly 3ae270a65d [formerly 7bf1316e8c]]]
Former-commit-id: 90bcb3ccff4d29226848450821d9d7a0561c420f [formerly 99d7658e5a1037952c27cb188299ce2c75c3e4ee] [formerly 46bedc0009 [formerly 80a6ade49c]]
Former-commit-id: 46bedc0009
Former-commit-id: d2d6f87ea4
|
2012-11-12 15:02:08 -06:00 |
|
Roger Ferrel
|
d37c40a03e
|
Issue #1298 Changes for non-blocking NewToolDialog.
Change-Id: I83bcbf9cf19785811d35b97d04442f404429fdb5
Former-commit-id: 5320a1e983 [formerly 499100c5b6] [formerly 6ec9c1fac4] [formerly 6ec9c1fac4 [formerly 9c9a068908]] [formerly 5320a1e983 [formerly 499100c5b6] [formerly 6ec9c1fac4] [formerly 6ec9c1fac4 [formerly 9c9a068908]] [formerly f48474fc82 [formerly 6ec9c1fac4 [formerly 9c9a068908] [formerly f48474fc82 [formerly b24c130aa9c612822dda92a9820912b0cd7bc852]]]]]
Former-commit-id: f48474fc82
Former-commit-id: 36fce83835 [formerly 0ff9252024] [formerly 398f71471d] [formerly 4924c64a4f46ed8723938d806a64686f48dd2788 [formerly bd145bd7ef91d95a7d99e1c2c708c0288c079123] [formerly 398f71471d [formerly b11413b7f0]]]
Former-commit-id: 472c487941ef2dc494249944b1d8c6c2edfded7f [formerly ed15417823f2dbb45b3e4174ea8470994e981549] [formerly 577c2b88ab [formerly 6b0c3820d8]]
Former-commit-id: 577c2b88ab
Former-commit-id: 16a23467c4
|
2012-11-12 14:22:02 -06:00 |
|
Lee Venable
|
1b43c507ad
|
Merge "Issue #1298 Changes for non-blocking NewTextProductDialog." into development
Former-commit-id: 8d11c7fdaa [formerly ca20167d7e] [formerly 72aedbcece] [formerly 72aedbcece [formerly ab62adea95]] [formerly 8d11c7fdaa [formerly ca20167d7e] [formerly 72aedbcece] [formerly 72aedbcece [formerly ab62adea95]] [formerly 7db247e33a [formerly 72aedbcece [formerly ab62adea95] [formerly 7db247e33a [formerly bec0ccddba047ab9e9b6fa64bf839e9930dc675b]]]]]
Former-commit-id: 7db247e33a
Former-commit-id: b13a58a231 [formerly 9715b63d07] [formerly 6ab3480255] [formerly 7c5b5f60b40be13e1e45eaea3127166a027643ff [formerly f8b76144c6d9b8fab6faf09c7b74e630b40f12eb] [formerly 6ab3480255 [formerly ded0bfb92f]]]
Former-commit-id: 9072c37da93a1cdb3dadf010671b8f193a137b6b [formerly 20006ac6ea0e775bf7a0df1f7b8087773eb18621] [formerly b02aebcfad [formerly 92063028bc]]
Former-commit-id: b02aebcfad
Former-commit-id: fd08ca5acc
|
2012-11-12 14:13:06 -06:00 |
|
Lee Venable
|
f7cbc2babb
|
Merge "Issue #1298 Changes for non-blocking GridInfoDialog." into development
Former-commit-id: 64b45424fe [formerly 6359f32b18] [formerly d9022d16a6] [formerly d9022d16a6 [formerly 879078484e]] [formerly 64b45424fe [formerly 6359f32b18] [formerly d9022d16a6] [formerly d9022d16a6 [formerly 879078484e]] [formerly 62c42850e8 [formerly d9022d16a6 [formerly 879078484e] [formerly 62c42850e8 [formerly a2a570c55e93b328735e2d2af887eadada92b6ea]]]]]
Former-commit-id: 62c42850e8
Former-commit-id: 92764b259f [formerly 65e6121178] [formerly 2b1be166a2] [formerly d9562c1371d8610b360a828c4655dea9b614533d [formerly 1f8212cdab972e8581982c2fcbe3c6e04bac34f3] [formerly 2b1be166a2 [formerly 4f26da9a9a]]]
Former-commit-id: 9b5bbad767ae9b68d932da884fafdef6e85be631 [formerly e350492e0ee7b6fe0757eb5ae8e74055fcda1128] [formerly 19bf7ac8aa [formerly 0a39d42de1]]
Former-commit-id: 64a1e0ebd44b256081737b845089d4f3e8c0de17 [formerly 19bf7ac8aa]
Former-commit-id: 2769b8cfb8
|
2012-11-12 14:09:44 -06:00 |
|
Roger Ferrel
|
87ce4e8816
|
Issue #1298 Changes for non-blocking NewTextProductDialog.
Change-Id: I0d04cdb18a07f2ea9cfa99e95708ff64a260d99d
Former-commit-id: 5776d6cf1a [formerly 5ea786daaf] [formerly ce6d6e277e] [formerly ce6d6e277e [formerly 3676829e8f]] [formerly 5776d6cf1a [formerly 5ea786daaf] [formerly ce6d6e277e] [formerly ce6d6e277e [formerly 3676829e8f]] [formerly ee323d9c60 [formerly ce6d6e277e [formerly 3676829e8f] [formerly ee323d9c60 [formerly b2d932d2f4bc6430fba99ecfa08fd2adb885b3ac]]]]]
Former-commit-id: ee323d9c60
Former-commit-id: c5544315f0 [formerly fe965f064e] [formerly 88968c54e5] [formerly 72d6bd690a3fbafb4e2a46a539c682b8d036a54f [formerly 43f3c54726102723a37b2f0b8b134e1f63f433fd] [formerly 88968c54e5 [formerly 73d9e78e92]]]
Former-commit-id: 521a79b6b7cfe107135360dea9a7aace60b9363f [formerly bef14f1fdcf05155d7ff267062b13a14b0473b34] [formerly d3eda170ed [formerly 4f86b0b521]]
Former-commit-id: d3eda170ed
Former-commit-id: 0815987920
|
2012-11-12 13:20:05 -06:00 |
|
Matt Nash
|
b5e0512cbd
|
Issue #1324 make times display in 24 hour time
Change-Id: I6ae145d64cd4e24f15b049eebe23822198ee7ed2
Former-commit-id: 577dc34bb2 [formerly 0894e7800d] [formerly 7fa21f5041] [formerly 7fa21f5041 [formerly 1480e0abfc]] [formerly 577dc34bb2 [formerly 0894e7800d] [formerly 7fa21f5041] [formerly 7fa21f5041 [formerly 1480e0abfc]] [formerly 0a2f7c9ed2 [formerly 7fa21f5041 [formerly 1480e0abfc] [formerly 0a2f7c9ed2 [formerly d7eab0e3c398b9ab90c9aa32e1d45920177620e4]]]]]
Former-commit-id: 0a2f7c9ed2
Former-commit-id: 7f80265fa2 [formerly ffa1d74e12] [formerly dcda4b3fa4] [formerly ec246aeb2a96af4a8df9fbadb4439cc022cd21ac [formerly f7c0905a51bc5c78ca29098eb0992a3aaccdc911] [formerly dcda4b3fa4 [formerly d728ffadd0]]]
Former-commit-id: 1c92d2da67a746bb41bd5849c8da7929bc2e0a7b [formerly dae98656c78fa5a0f419dc725bd1b21e659e88c6] [formerly 4822f87139 [formerly 31241c2d94]]
Former-commit-id: 4822f87139
Former-commit-id: bd4226a7dd
|
2012-11-12 12:53:26 -06:00 |
|
Roger Ferrel
|
1a6667ce9d
|
Issue #1298 Changes for non-blocking GridInfoDialog.
Change-Id: Ib0167b1cd63ca568250a75efa5cd0ffc8dc0885a
Former-commit-id: d807f2ce78 [formerly dde8ce56c0] [formerly 1f509c5a54] [formerly 1f509c5a54 [formerly 30ef939e3c]] [formerly d807f2ce78 [formerly dde8ce56c0] [formerly 1f509c5a54] [formerly 1f509c5a54 [formerly 30ef939e3c]] [formerly 438731ca2e [formerly 1f509c5a54 [formerly 30ef939e3c] [formerly 438731ca2e [formerly ea26ccdc4e0bccdeb1c61f8bd1566a83ed87d433]]]]]
Former-commit-id: 438731ca2e
Former-commit-id: 9ab14337f8 [formerly 5e77bcf8bd] [formerly 8490814573] [formerly 21ddc5205ddccafc2df14de6f747d7121599d36c [formerly 3a0ae83fcc9d5bbb65ad3b13ffe372cc97db6e13] [formerly 8490814573 [formerly 195d876753]]]
Former-commit-id: 86d8e4258eb612439ff687f10af64baa01911459 [formerly 8bf88cd2569f48497094f5687e8b29ee0842b0f2] [formerly f5343fae99 [formerly df5b8485c6]]
Former-commit-id: f5343fae99
Former-commit-id: 97ddd8da5b
|
2012-11-12 12:00:03 -06:00 |
|
Roger Ferrel
|
26b8c20336
|
Issue #1298 CaveDialogUtility and changes for non-blocking ShuffleZoneGroupsDialog.
Changes from reviewer's comments.
Change-Id: I92ded0550563758c6f2ce4aef1dce08a42f9e079
Former-commit-id: a6a5050a77 [formerly 259949bc5f] [formerly b60cbeda7a] [formerly b60cbeda7a [formerly d89ce26aeb]] [formerly a6a5050a77 [formerly 259949bc5f] [formerly b60cbeda7a] [formerly b60cbeda7a [formerly d89ce26aeb]] [formerly d489a7ef9f [formerly b60cbeda7a [formerly d89ce26aeb] [formerly d489a7ef9f [formerly ac9b159e639b51da8ae6b527907926d1fe8efdd0]]]]]
Former-commit-id: d489a7ef9f
Former-commit-id: ab59988a12 [formerly 2916b0a3b8] [formerly ecba7301a1] [formerly c7294fd2ef70bcbe962e1c3488206ce7ca393555 [formerly 8767fadd2a0a8ed1a13ec17c8ffe7adca41ac200] [formerly ecba7301a1 [formerly e01a4ae243]]]
Former-commit-id: 3a8b7a25eabd5043dd880ffea4e72836592014d0 [formerly 280f44f50ca572fc6a52526bf07eaa615dc5f1be] [formerly e1bf6814d8 [formerly 26afb7f186]]
Former-commit-id: e1bf6814d8
Former-commit-id: 91e47f49aa
|
2012-11-12 07:14:15 -06:00 |
|
Ben Steffensmeier
|
a6b226f0a3
|
Issue #1108 fix the order of arguments for grib 1 parameter mappings
Former-commit-id: ec2c440825 [formerly f0add08709] [formerly 894998b95f] [formerly 894998b95f [formerly adf0fec9a2]] [formerly ec2c440825 [formerly f0add08709] [formerly 894998b95f] [formerly 894998b95f [formerly adf0fec9a2]] [formerly c4f99aae63 [formerly 894998b95f [formerly adf0fec9a2] [formerly c4f99aae63 [formerly 7dee708d0da36dd9e9bdb096ed32f4cc4f067bdb]]]]]
Former-commit-id: c4f99aae63
Former-commit-id: 93e7571a75 [formerly 3789a954e4] [formerly 5ee5347fc0] [formerly 88be8b3f066f394efefdc72f2b6cd4156902749e [formerly dffdc11f9cdd9bfde1d32282b4a7f3429e11fcd4] [formerly 5ee5347fc0 [formerly 87ec259477]]]
Former-commit-id: 09f2be6f3343035a94571b12793f6a6300faadf1 [formerly 67cd5bcc093a0594bf1f5fe675ad20437cc9653c] [formerly 923731a717 [formerly e2b7486803]]
Former-commit-id: 923731a717
Former-commit-id: b94d28d028
|
2012-11-09 13:36:49 -06:00 |
|
Lee Venable
|
44f4190733
|
Merge "Issue #1298 Changes for non-blocking IssuanceSiteIdDlg." into development
Former-commit-id: 6bce21413b [formerly db5861e92a] [formerly 125ac804a7] [formerly 125ac804a7 [formerly 109076cb73]] [formerly 6bce21413b [formerly db5861e92a] [formerly 125ac804a7] [formerly 125ac804a7 [formerly 109076cb73]] [formerly dac9544eed [formerly 125ac804a7 [formerly 109076cb73] [formerly dac9544eed [formerly 5d3efae3ddbfafd2cbab419daa14a8259b2863e6]]]]]
Former-commit-id: dac9544eed
Former-commit-id: d410864574 [formerly 449d8fe737] [formerly ff21b8d604] [formerly 14feec47c41d0d0e2f36cffd26e7145d1a5add74 [formerly 76216f132fefed0fdc4bd9c84d50f9a3ed79b5c9] [formerly ff21b8d604 [formerly a267d9020b]]]
Former-commit-id: 1aaa63110bffe9b783d45688d430715636c31032 [formerly a116454464d997070a4addda0f908f338049273a] [formerly 2542ec20ca [formerly 458133c121]]
Former-commit-id: 0867099374ecd2e42e83e87b73a880f72f989603 [formerly 2542ec20ca]
Former-commit-id: 3dd781dc0c
|
2012-11-08 17:06:54 -06:00 |
|
Nate Jensen
|
1bb4928cf2
|
Merge "Issue #1302 Restore jdom.jar, delete net.jcip/.project" into development
Former-commit-id: 67b9b97b5b [formerly 78d49992a3] [formerly 5e718ca85b] [formerly 5e718ca85b [formerly a92bfa9393]] [formerly 67b9b97b5b [formerly 78d49992a3] [formerly 5e718ca85b] [formerly 5e718ca85b [formerly a92bfa9393]] [formerly cdd6a986e8 [formerly 5e718ca85b [formerly a92bfa9393] [formerly cdd6a986e8 [formerly e08068e0f400abe1a6bddef1462f9f67d8dac2de]]]]]
Former-commit-id: cdd6a986e8
Former-commit-id: 559d5a5bfc [formerly 974598ee1c] [formerly 38511f0e95] [formerly 4e12e5723b34f2baeb1d06e9cdfb13e0041515b9 [formerly 67d145eb7b7c1dca029604c66311e8cc639f5e68] [formerly 38511f0e95 [formerly 5e3c076506]]]
Former-commit-id: e821abb9f8b08f387ead1d43bdbee329545bf2f0 [formerly f605318df455820c0ce41f157decea6fd4933d6a] [formerly f3daf3dfbb [formerly cbd03947da]]
Former-commit-id: f3daf3dfbb
Former-commit-id: fd4deff58c
|
2012-11-08 14:50:17 -06:00 |
|
Dustin Johnson
|
57c029b9a1
|
Issue #1302 Restore jdom.jar, delete net.jcip/.project
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 91cad99824 [formerly 19c2e301b8] [formerly db4d728eb7] [formerly db4d728eb7 [formerly 595c421e47]] [formerly 91cad99824 [formerly 19c2e301b8] [formerly db4d728eb7] [formerly db4d728eb7 [formerly 595c421e47]] [formerly 2b6e98954e [formerly db4d728eb7 [formerly 595c421e47] [formerly 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]]]]
Former-commit-id: 2b6e98954e
Former-commit-id: a6d72a4c39 [formerly 272761ae41] [formerly eac5bc8197] [formerly de9f2ae72306eebeb98b4928d9525fc9511b4dd5 [formerly 3fe0762a484ee2e5830878352f009474c977d9f7] [formerly eac5bc8197 [formerly 0806be04dd]]]
Former-commit-id: ba888e2b41dd9c897005f308d7b06e70667a9897 [formerly 8e66108e274790c8749fcb207ab943f1083f8acf] [formerly f9c6566ba7 [formerly 1317e0b3ef]]
Former-commit-id: f9c6566ba7
Former-commit-id: 63240a4ec5
|
2012-11-08 14:47:17 -06:00 |
|
Ben Steffensmeier
|
3cd97a0475
|
Issue #1108 initial implementation of mappings
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
Former-commit-id: 9691e6be29 [formerly a0f6c320cb] [formerly 20e618eb4f] [formerly 20e618eb4f [formerly 535c73051d]] [formerly 9691e6be29 [formerly a0f6c320cb] [formerly 20e618eb4f] [formerly 20e618eb4f [formerly 535c73051d]] [formerly 693090cb36 [formerly 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]]]]
Former-commit-id: 693090cb36
Former-commit-id: 0322df12db [formerly 0f58b01a58] [formerly 7c93db759c] [formerly c7f7b315423aa70bdc65bafbe61c85bcba01e272 [formerly 0198876d17ad6ff76ff77ca6660a268c711628d2] [formerly 7c93db759c [formerly 884c82c4fe]]]
Former-commit-id: 8c36a4dfee9e817e52b4e990e18219102bdcc6d6 [formerly da5f64af6d14ef1d9c652871f9f0529b022242a9] [formerly 2223e6ff64 [formerly 74d1381180]]
Former-commit-id: 3bfd708c9cf79e8c98cd0a0641d4292cb69ed817 [formerly 2223e6ff64]
Former-commit-id: 062505e855
|
2012-11-08 14:45:36 -06:00 |
|
Richard Peter
|
fb33636249
|
Merge "Issue #189 add more comments to grib decoder." into development
Former-commit-id: c58d09b811 [formerly cd8c43078b] [formerly 7f49c5fe04] [formerly 7f49c5fe04 [formerly db28cc26aa]] [formerly c58d09b811 [formerly cd8c43078b] [formerly 7f49c5fe04] [formerly 7f49c5fe04 [formerly db28cc26aa]] [formerly 7077a82458 [formerly 7f49c5fe04 [formerly db28cc26aa] [formerly 7077a82458 [formerly 1ad439769c601fe61365f015bc56da0442553be5]]]]]
Former-commit-id: 7077a82458
Former-commit-id: ab915810f4 [formerly 9e1e81e840] [formerly fa6141c745] [formerly fc8b80967056b6e6efe9b25faaaa54f94a2037c8 [formerly 6c3e03fe9fc18f974ee8a5be0a2bda96c5aff4f6] [formerly fa6141c745 [formerly e1852956e2]]]
Former-commit-id: c5f8781a12f67b782d79f9281dabf4521c0644b9 [formerly acce3fbfc6b39ab02f986035802c76e0077fd4f6] [formerly 19a98b3fad [formerly 80862cd12e]]
Former-commit-id: 19a98b3fad
Former-commit-id: 1e69b1df57
|
2012-11-08 14:40:05 -06:00 |
|
Ben Steffensmeier
|
afabc666ad
|
Issue #189 merge ncep changes to unified grid.
Change-Id: I3dac0d3785f093c095f50799890744919edb1891
Former-commit-id: ddee913722 [formerly c17b92afc5] [formerly f62cf2713d] [formerly f62cf2713d [formerly e6b0751f5c]] [formerly ddee913722 [formerly c17b92afc5] [formerly f62cf2713d] [formerly f62cf2713d [formerly e6b0751f5c]] [formerly fbed67a208 [formerly f62cf2713d [formerly e6b0751f5c] [formerly fbed67a208 [formerly 99cf68672dcfbf23c89531279cb4fcd1254b0703]]]]]
Former-commit-id: fbed67a208
Former-commit-id: 1cb982eddd [formerly b664a9e649] [formerly d75b59622a] [formerly 8517b475e0761003823f5dfec9c3fa9b31b354d5 [formerly b5eb27fb49abd5ab7570ad430a356c40d5ae9848] [formerly d75b59622a [formerly 7c9341a3a6]]]
Former-commit-id: 14eab691000af7f9625047223a2b402d899571c1 [formerly fe88c86a07e948a680250c58c72bfa9ef94a60ca] [formerly 35b855635f [formerly 40a07f8998]]
Former-commit-id: 35b855635f
Former-commit-id: 8399158199
|
2012-11-08 14:34:55 -06:00 |
|
Richard Peter
|
d9bd0023b3
|
Merge "Issue #189 fix another Unknown Model" into development
Former-commit-id: 2fd5083dc5 [formerly 50ddeed8e6] [formerly 10138f3ae8] [formerly 10138f3ae8 [formerly 7d8dfb9c01]] [formerly 2fd5083dc5 [formerly 50ddeed8e6] [formerly 10138f3ae8] [formerly 10138f3ae8 [formerly 7d8dfb9c01]] [formerly 675b1666fd [formerly 10138f3ae8 [formerly 7d8dfb9c01] [formerly 675b1666fd [formerly 1db05733b3a8c0d09dc4613d82dc74e55c0e110a]]]]]
Former-commit-id: 675b1666fd
Former-commit-id: a563f0898b [formerly e4aad5fcad] [formerly e7151070ee] [formerly 8e91a5f2740fe934d8ac94a80f870f20826dd03f [formerly be2444c1dd881e3611f5733295f49ae808e5d940] [formerly e7151070ee [formerly ed90d0aa23]]]
Former-commit-id: 704d96f260f6361d4099da49e4be9f9d4ab7f863 [formerly 34593cc1e1167309e983c82d0d71f4f54c60ec8b] [formerly decf129e94 [formerly 1ce242e9f0]]
Former-commit-id: decf129e94
Former-commit-id: 8f2f705e20
|
2012-11-08 13:43:37 -06:00 |
|
Richard Peter
|
ff72532e30
|
Merge "Issue #1317 - Update the stats config files Issue #1317 - Peer review comments." into development
Former-commit-id: a998a154fa [formerly fbe5195de2] [formerly 62e5aff255] [formerly 62e5aff255 [formerly 3450ca3cd3]] [formerly a998a154fa [formerly fbe5195de2] [formerly 62e5aff255] [formerly 62e5aff255 [formerly 3450ca3cd3]] [formerly 2e9cdbe43e [formerly 62e5aff255 [formerly 3450ca3cd3] [formerly 2e9cdbe43e [formerly 6fce68b90116d30cf090db64032322916276136b]]]]]
Former-commit-id: 2e9cdbe43e
Former-commit-id: 14e1987826 [formerly 4699630bee] [formerly b8ea93cb95] [formerly 66486ee992a03423e75969fc81a9da08b85432b9 [formerly a52da4e3f534d6b1c014b4090e04029d85686d2b] [formerly b8ea93cb95 [formerly 4e0c207306]]]
Former-commit-id: 930c1e8fbbbbf6cbffca58ad1da237d8eab07053 [formerly f86b250fd3d09f2abe58e40dde9aedc0200a1b48] [formerly 04bd114046 [formerly e72818025a]]
Former-commit-id: 04bd114046
Former-commit-id: 95f360eadf
|
2012-11-08 13:30:27 -06:00 |
|
Dustin Johnson
|
0e2d22ea9d
|
Issue #1302 Fix spring/project errors pointed out by CAVE spring changes
Change-Id: I2b39071348bea5394c4f275051f19a2853f61f1c
Former-commit-id: 9464f4eaa5 [formerly 67e02347b5] [formerly 1220f5167e] [formerly 1220f5167e [formerly ddaa681d8a]] [formerly 9464f4eaa5 [formerly 67e02347b5] [formerly 1220f5167e] [formerly 1220f5167e [formerly ddaa681d8a]] [formerly 9784b563cf [formerly 1220f5167e [formerly ddaa681d8a] [formerly 9784b563cf [formerly 217a17fe79d9156f03597d72e51ab47325b00991]]]]]
Former-commit-id: 9784b563cf
Former-commit-id: 6e2a62b138 [formerly 0eb86d565e] [formerly d0867fedef] [formerly 57ee5adc7487b9ee89f0cced17ccfc7515f6e800 [formerly 4d6abc650d9441b7590743271c86e80abcff2657] [formerly d0867fedef [formerly 9bb53555a9]]]
Former-commit-id: 6b19c13d4888fee0e96c441d3641342d0a76f8d2 [formerly 4d8009edd28c60ab7a3978054089c3f8ebdd0b7f] [formerly 1ac34361b4 [formerly cd392c40bf]]
Former-commit-id: 1ac34361b4
Former-commit-id: 2a67e36e56
|
2012-11-08 12:00:15 -06:00 |
|
Roger Ferrel
|
9c5c1259c8
|
Issue #1298 Changes for non-blocking IssuanceSiteIdDlg.
Change-Id: I735b63606c3ca6f680f47bd61e55658b18c223ba
Former-commit-id: 2e84d0b4a8 [formerly fb742c6dbf] [formerly 709798659d] [formerly 709798659d [formerly e26b14a84d]] [formerly 2e84d0b4a8 [formerly fb742c6dbf] [formerly 709798659d] [formerly 709798659d [formerly e26b14a84d]] [formerly 89617dda68 [formerly 709798659d [formerly e26b14a84d] [formerly 89617dda68 [formerly a2a52b7754d831406e591763930f419def7cb1eb]]]]]
Former-commit-id: 89617dda68
Former-commit-id: 7a50e283be [formerly ddeecc6e98] [formerly 553344fb3b] [formerly 12ca2f566b1dbe1078ee3e86a4f3339a4d384b0e [formerly 905e3bb90604a5bd868eee7dd06299aedc0f819f] [formerly 553344fb3b [formerly 05825bd6f3]]]
Former-commit-id: 91a2e049d836622af4b3929e68e2619775aee14d [formerly b5165931eb57a4fadceb017392a53e8e879158a7] [formerly e3b4a7d750 [formerly f13bedab32]]
Former-commit-id: e3b4a7d750
Former-commit-id: 4aeb7fd6d3
|
2012-11-08 11:19:51 -06:00 |
|
Lee Venable
|
952d328567
|
Merge "Issue #1298 Changes for non-blocking SaveDeleteComboDlg." into development
Former-commit-id: be31846385 [formerly 72972d37b7] [formerly 6c0bb76679] [formerly 6c0bb76679 [formerly be460c956e]] [formerly be31846385 [formerly 72972d37b7] [formerly 6c0bb76679] [formerly 6c0bb76679 [formerly be460c956e]] [formerly e791e73a30 [formerly 6c0bb76679 [formerly be460c956e] [formerly e791e73a30 [formerly ac3fa82789459f71be3ef8cea589606e10b6506f]]]]]
Former-commit-id: e791e73a30
Former-commit-id: a88f366606 [formerly 40c27a2403] [formerly 1e61d4bd08] [formerly 912e62d44fa1da37513a86b374fa34ca45d71ee2 [formerly 7998fddf765b511c29eef50d418b778e580e742f] [formerly 1e61d4bd08 [formerly 7b5f085643]]]
Former-commit-id: 8c88cf287dc8e785f1d987d55e5e1964d292adab [formerly b8dfecdcf985598d2b3b7bb6282c85fef8b7df6e] [formerly 2f390bd372 [formerly b3991fa4c9]]
Former-commit-id: 2f390bd372
Former-commit-id: b24d461c8d
|
2012-11-08 11:11:15 -06:00 |
|
Nate Jensen
|
f7c19791d3
|
Merge "Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time." into development
Former-commit-id: 2e4c72c8e7 [formerly 00dcf33480] [formerly e3487942ac] [formerly e3487942ac [formerly 96cb1ecc7f]] [formerly 2e4c72c8e7 [formerly 00dcf33480] [formerly e3487942ac] [formerly e3487942ac [formerly 96cb1ecc7f]] [formerly 01072652dc [formerly e3487942ac [formerly 96cb1ecc7f] [formerly 01072652dc [formerly f6eeb7431fe55886a7958beeec7f8f67de7bf74a]]]]]
Former-commit-id: 01072652dc
Former-commit-id: ba81136d4e [formerly 650f477e09] [formerly bdbad943ef] [formerly f2413eb1ad2099d20ec6857da1d76d05ac74fb76 [formerly aaf573b212c0441c984a07ad356d4eb57494bd79] [formerly bdbad943ef [formerly 375c864d28]]]
Former-commit-id: 6a1f2d0167da3c23097aecb43801be970145bdec [formerly 37993b2f7b4b612fb5581e122656c2af79b9c13d] [formerly d70b6dd868 [formerly 7430e8dbfe]]
Former-commit-id: d70b6dd868
Former-commit-id: c01ba565ff
|
2012-11-08 11:08:48 -06:00 |
|
Lee Venable
|
05cde29cea
|
Merge "Issue #1298 Changes for non-blocking FuzzValueDialog." into development
Former-commit-id: 9249366ec2 [formerly fae33021a4] [formerly c4526c5ba0] [formerly c4526c5ba0 [formerly ff5083715b]] [formerly 9249366ec2 [formerly fae33021a4] [formerly c4526c5ba0] [formerly c4526c5ba0 [formerly ff5083715b]] [formerly c44f90f675 [formerly c4526c5ba0 [formerly ff5083715b] [formerly c44f90f675 [formerly e8ed91fc876a3f7e6dd67e058c3117cb616c96d2]]]]]
Former-commit-id: c44f90f675
Former-commit-id: a9ed1388aa [formerly b1b2512819] [formerly 9523ad6085] [formerly ccb25c0985c534335b7ac4da4d722816bb6cdaac [formerly 0f61b7daa2e57b5bf03170e39269f6b4fa2377a4] [formerly 9523ad6085 [formerly 4a22ded443]]]
Former-commit-id: 272c1bce0446aa9b78db336782f5bdb72cd0480a [formerly be37ba43b25491e7af4571b70fb7f2031ae1ad99] [formerly 4329af5cea [formerly 3bdfe02fe3]]
Former-commit-id: 4329af5cea
Former-commit-id: 8e85bbad3e
|
2012-11-08 10:57:45 -06:00 |
|
Roger Ferrel
|
27cf11c930
|
Issue #1298 Changes for non-blocking SaveDeleteComboDlg.
Change-Id: Idd57cb86f9d91526de6e460fcd181a16f9d30e9f
Former-commit-id: 212efae8a7 [formerly 853a3e6593] [formerly 359ee69fa6] [formerly 359ee69fa6 [formerly dfb55edb3d]] [formerly 212efae8a7 [formerly 853a3e6593] [formerly 359ee69fa6] [formerly 359ee69fa6 [formerly dfb55edb3d]] [formerly eae8a68fd5 [formerly 359ee69fa6 [formerly dfb55edb3d] [formerly eae8a68fd5 [formerly 1305c8a16f0a7adcedcfb3c1b43c206fcd1dfcec]]]]]
Former-commit-id: eae8a68fd5
Former-commit-id: cd331ae075 [formerly 3851d5161c] [formerly e7aa940f52] [formerly c08938b08c85749aeb245fd8a8bf4a4b5377a650 [formerly 0211367abde3087618fb2170a6c9b3664254ca94] [formerly e7aa940f52 [formerly 24a2e79b28]]]
Former-commit-id: f10318ed46558bc9fb7e671bc4c69cf0a015cc7a [formerly 410107753569223f9d35b6fd82a686616658272c] [formerly b895611562 [formerly 062109f9a7]]
Former-commit-id: b895611562
Former-commit-id: 91cbd20ccc
|
2012-11-08 10:54:41 -06:00 |
|
Nate Jensen
|
91ed48e934
|
Merge "Issue #1302 Address peer review comments for 5-Data_Delivery/development merge" into development
Former-commit-id: 3f5cafb5be [formerly d701700a35] [formerly ca5db2ec43] [formerly ca5db2ec43 [formerly 9038ff4e10]] [formerly 3f5cafb5be [formerly d701700a35] [formerly ca5db2ec43] [formerly ca5db2ec43 [formerly 9038ff4e10]] [formerly 48dae3a5e9 [formerly ca5db2ec43 [formerly 9038ff4e10] [formerly 48dae3a5e9 [formerly 92480a9a89c2768e7af9d8d1bcb9afe141d76f55]]]]]
Former-commit-id: 48dae3a5e9
Former-commit-id: aea88c86de [formerly 3c7d135bc5] [formerly fca1922f7b] [formerly 3e089c4553ce748ee2f2e4c7891200f58ced2cbd [formerly a70bb91d05156498a7bfb00ef3a008ed19da7cae] [formerly fca1922f7b [formerly 7da4882cfb]]]
Former-commit-id: afa0f5b531bd0485d09e98679afd0c613024aaf7 [formerly 1c124a831176eac847bf92a91a34c3e157d4aaa7] [formerly 42dc82c260 [formerly 7d8c983f1e]]
Former-commit-id: 42dc82c260
Former-commit-id: 3708f9b773
|
2012-11-08 10:34:56 -06:00 |
|
Mike Duff
|
127c6d488f
|
Issue #1317 - Update the stats config files
Issue #1317 - Peer review comments.
Change-Id: Ic4fa6574a0d71fbdf246483f0ea2553d4d058c9f
Former-commit-id: f9b477eb20 [formerly 7398e4fd68] [formerly e72c2822ad] [formerly e72c2822ad [formerly 1372c08cdc]] [formerly f9b477eb20 [formerly 7398e4fd68] [formerly e72c2822ad] [formerly e72c2822ad [formerly 1372c08cdc]] [formerly 50f0c4c226 [formerly e72c2822ad [formerly 1372c08cdc] [formerly 50f0c4c226 [formerly 8cc9210d25324ab4b5cbd5af3687b371101d282b]]]]]
Former-commit-id: 50f0c4c226
Former-commit-id: 935d477875 [formerly 26210e06ef] [formerly 7bed38a373] [formerly d90669eb9ee8a5aa2c8aea3fab12f580e2642cd5 [formerly f2b77e9dc771b60a8323ff83614ff068514ec645] [formerly 7bed38a373 [formerly 688b7cce30]]]
Former-commit-id: 424bc3976e11c5b80dae469de67101fd811e747f [formerly 439fa8528bc980d4f66acf555660ffd2ad83b7b3] [formerly d08fca46ef [formerly a4574d22b1]]
Former-commit-id: d08fca46ef
Former-commit-id: 1311448ee0
|
2012-11-08 10:15:41 -06:00 |
|
Max Schenkelberg
|
58326169a0
|
Issue #1308 Fixed ScanUtils unneeded dependency on BinLightningDao by switching to PluginDao. Added comments to various classes and fixed bug in menu generation code that would cause menus that use checkCreation(String,String) to regenerate menus every time.
Change-Id: Icc7f89812936f97029e2a06adbc527ec658d8d9b
Former-commit-id: 3a7e5f79ae [formerly 001d0710e7] [formerly 5f0b4286ba] [formerly 5f0b4286ba [formerly 9aa4221fdf]] [formerly 3a7e5f79ae [formerly 001d0710e7] [formerly 5f0b4286ba] [formerly 5f0b4286ba [formerly 9aa4221fdf]] [formerly c80dbffad8 [formerly 5f0b4286ba [formerly 9aa4221fdf] [formerly c80dbffad8 [formerly 598e0268c95155536fb94798cc134d18b2566dbc]]]]]
Former-commit-id: c80dbffad8
Former-commit-id: 4ca85aed7b [formerly 577a6e3631] [formerly c219fcb112] [formerly 8dfc7efcb68de1820131dd88203ed75a94bcded3 [formerly 07b9c0188335e4ff522ce4e82831fe234a9fdd70] [formerly c219fcb112 [formerly 0a410412db]]]
Former-commit-id: 5c88d857493c88e4245d22ed3a7c0810ed5f620d [formerly 9e391025cbbca9821f11536724c5e64f2e425fde] [formerly f1a74fb0c5 [formerly d7afa4376e]]
Former-commit-id: f1a74fb0c5
Former-commit-id: 23f933d9c3
|
2012-11-08 10:08:38 -06:00 |
|
Dustin Johnson
|
8863642277
|
Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
More peer review comments
Restore PreferencesHandler
Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7
Former-commit-id: c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly c9207269a3 [formerly acd4cf94d8] [formerly efd3d3735a] [formerly efd3d3735a [formerly 064ef82d1e]] [formerly 1dbeb22893 [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: e9b7956d0f [formerly cd5faf58bf] [formerly 2d1e886cf3] [formerly e239f886daa359a6280760b8fa6b78b5c8380ec8 [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc] [formerly 2d1e886cf3 [formerly 4222b24d09]]]
Former-commit-id: 807d5554bc7b021defe634c74b7c5d059408a145 [formerly 58274565203c021076e001f24f089a98cd2216f6] [formerly b4a13190ad [formerly 6613c51d3b]]
Former-commit-id: b4a13190ad
Former-commit-id: eb82c7672b
|
2012-11-08 09:57:16 -06:00 |
|
Roger Ferrel
|
fbd93f9ed0
|
Issue #1298 Changes for non-blocking FuzzValueDialog.
Change-Id: I7f6c6349b2576a9e692570f2fc118d939ee8efef
Former-commit-id: 8c5dd78cfc [formerly c44dd45f87] [formerly 3ad0d7d516] [formerly 3ad0d7d516 [formerly 023252fb84]] [formerly 8c5dd78cfc [formerly c44dd45f87] [formerly 3ad0d7d516] [formerly 3ad0d7d516 [formerly 023252fb84]] [formerly c3f451f799 [formerly 3ad0d7d516 [formerly 023252fb84] [formerly c3f451f799 [formerly 74c370aa04efb9493d995f8f62a07dcd43702465]]]]]
Former-commit-id: c3f451f799
Former-commit-id: 58117eb198 [formerly 7bd36bb2c7] [formerly 9a1283fb1e] [formerly d02aea5526615dccb17df35c35274d1bdae39399 [formerly 9bc5add0937b47a44fcc72985df13d60bf528a0c] [formerly 9a1283fb1e [formerly de534f5b43]]]
Former-commit-id: b020617832942d19c4f0d7c31bf786e674270828 [formerly b208c9f9303fd4a49e76687d5d29d7b62b00e4c8] [formerly eea2a76c7f [formerly bf4c19927c]]
Former-commit-id: eea2a76c7f
Former-commit-id: f57f694b63
|
2012-11-08 08:24:38 -06:00 |
|
Roger Ferrel
|
0dba637037
|
Issue #1298 Chnages for non-blocking FindReplaceDlg.
Change-Id: I165d2eb45b2c768b7fca05c1f29d2460b25b18a7
Former-commit-id: 633dcece8d [formerly 4aafcb8311] [formerly 94a4440625] [formerly 94a4440625 [formerly 76f60240c5]] [formerly 633dcece8d [formerly 4aafcb8311] [formerly 94a4440625] [formerly 94a4440625 [formerly 76f60240c5]] [formerly 199475f671 [formerly 94a4440625 [formerly 76f60240c5] [formerly 199475f671 [formerly 8b38c0ce8e1d5a4d6d7b345ec5e1ba975dde5900]]]]]
Former-commit-id: 199475f671
Former-commit-id: 66a5c8c8a3 [formerly 66a19a85b3] [formerly c1d0b744b2] [formerly 5058d80300f0a2ec812cc9d57064b20367935386 [formerly 40d79f26c493b7dacab3299f8b6b97602b46386e] [formerly c1d0b744b2 [formerly e072532a77]]]
Former-commit-id: cef96e2389fb7a332d2033502c7bcbabd5838fdc [formerly f909632659ffcd3cb6769219079a19d901505943] [formerly 056dbf2fb3 [formerly 3aa144b2df]]
Former-commit-id: 056dbf2fb3
Former-commit-id: 787f9b6278
|
2012-11-08 07:57:56 -06:00 |
|
Bryan Kowal
|
9beff1539b
|
Issue #1318 - fix first dat dependency issue.
Change-Id: If7e1668799a8523afebb0d4b7de76be6add5aa78
Former-commit-id: 36205455ec [formerly 872c104321] [formerly a4d6021e5f] [formerly a4d6021e5f [formerly 079fdb33a0]] [formerly 36205455ec [formerly 872c104321] [formerly a4d6021e5f] [formerly a4d6021e5f [formerly 079fdb33a0]] [formerly 88a5451ce1 [formerly a4d6021e5f [formerly 079fdb33a0] [formerly 88a5451ce1 [formerly 0087827da79fedd354a227bad4e02aa76cebc684]]]]]
Former-commit-id: 88a5451ce1
Former-commit-id: a4d905d6d4 [formerly d68619f4a7] [formerly b45ba40abf] [formerly d9d3e76555b05d83f3b7c2a90a887a17e600e902 [formerly 8fa4f436be1875e2804bfffd7d8de4c33cfcbff3] [formerly b45ba40abf [formerly 4f36912786]]]
Former-commit-id: 2deaa7378b0d3d8d1b8a8c51d916a3c222d4fa9a [formerly 57b98543bd4dbe98b81e2898652d512aac412692] [formerly c25250edd9 [formerly 1b19c0f3c0]]
Former-commit-id: f5182131e704bec2d587e90f8bb65c5a805d48dd [formerly c25250edd9]
Former-commit-id: 8e8c6cb350
|
2012-11-08 07:27:39 -06:00 |
|
Nate Jensen
|
875014d43e
|
Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development
Former-commit-id: f4ea614015 [formerly b0bb920fde] [formerly 20a63254e2] [formerly 20a63254e2 [formerly b32a9e839e]] [formerly f4ea614015 [formerly b0bb920fde] [formerly 20a63254e2] [formerly 20a63254e2 [formerly b32a9e839e]] [formerly 6b205399d4 [formerly 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]]]]
Former-commit-id: 6b205399d4
Former-commit-id: 2a2d3f87f4 [formerly 19b0afefc5] [formerly 2fe69a5871] [formerly 33808384164db5b961db83a8213de4298501d75e [formerly 04ac668436ffe2114a4379e6e35db8978db0e543] [formerly 2fe69a5871 [formerly e3208d48a0]]]
Former-commit-id: ed9ee3ee3d6167adbc1e0bcc851458d4d9ff2091 [formerly 9da7f44423baa4bda5048fd140e50b9a387e9505] [formerly 04c843cb1b [formerly 01e11761d8]]
Former-commit-id: 04c843cb1b
Former-commit-id: 5d362c8a85
|
2012-11-07 18:18:06 -06:00 |
|
Lee Venable
|
d44ce378d0
|
Merge "Issue #1298 Changes for non-blocking ClearZoneGroupsDialog." into development
Former-commit-id: 08dfd05f3d [formerly dbeb600e58] [formerly c8955b5425] [formerly c8955b5425 [formerly 36c44db46b]] [formerly 08dfd05f3d [formerly dbeb600e58] [formerly c8955b5425] [formerly c8955b5425 [formerly 36c44db46b]] [formerly 8956718961 [formerly c8955b5425 [formerly 36c44db46b] [formerly 8956718961 [formerly 9b634a3ba62f8c151e6adf85fac26b9174defc7e]]]]]
Former-commit-id: 8956718961
Former-commit-id: 85ac6871a0 [formerly ddd96f4552] [formerly 15842d7d22] [formerly 451a1aaf7979b697641e343470d40826be616904 [formerly b323e3bf5eafbd091abc62b049b1e38dec9c47bc] [formerly 15842d7d22 [formerly eacc1ca32c]]]
Former-commit-id: 7b348904eae47f97d354f79c4d511fce9b7f9372 [formerly 053f6922c519820f3a8948f94169b5b5dfa99a64] [formerly 374a019df4 [formerly 139ca20a3c]]
Former-commit-id: 374a019df4
Former-commit-id: 263fa461c1
|
2012-11-07 17:38:21 -06:00 |
|
Lee Venable
|
f198e69cd4
|
Merge "Issue #1298 Changes for non-blocking CallToActionsDlg." into development
Former-commit-id: f49546cd20 [formerly d66bc87da4] [formerly b52b156faa] [formerly b52b156faa [formerly c2e8c3a50e]] [formerly f49546cd20 [formerly d66bc87da4] [formerly b52b156faa] [formerly b52b156faa [formerly c2e8c3a50e]] [formerly 0dff0bf0b7 [formerly b52b156faa [formerly c2e8c3a50e] [formerly 0dff0bf0b7 [formerly 9efe5208b4383d844c32fb7d8207ce48a04d27d6]]]]]
Former-commit-id: 0dff0bf0b7
Former-commit-id: f918d412fa [formerly 1961416ba0] [formerly d985b1c66e] [formerly 8f38788d763204d818ce5fa2b61c578039eec855 [formerly afc3dbfffcd3b5a490f2fd2782d576edae187158] [formerly d985b1c66e [formerly 7fdfbae106]]]
Former-commit-id: e0e1d9898d591d85588e49c970a37d429b77edfb [formerly 0c9e06ea594233d6aa615b11d730d37281bfeea7] [formerly 1202366429 [formerly f865c6c33d]]
Former-commit-id: 1202366429
Former-commit-id: 364f4b9fe4
|
2012-11-07 17:38:03 -06:00 |
|
Brad Gonzales
|
8470862a2d
|
Issue #1309 added units to Aggregate.java and AggregateRecord.java
Amend:
Changed ProcessEvent.processingTime and ProcessEvent.processingLatency to longs.
Removed Unit from AggregateRecord.java.
Change-Id: If4f6fccb65c584055d68129874a398d6391155e7
Former-commit-id: 7b634f2cea [formerly 04d7e36077] [formerly 2a0b6ad151] [formerly 2a0b6ad151 [formerly 577df6943e]] [formerly 7b634f2cea [formerly 04d7e36077] [formerly 2a0b6ad151] [formerly 2a0b6ad151 [formerly 577df6943e]] [formerly 4c49c9116d [formerly 2a0b6ad151 [formerly 577df6943e] [formerly 4c49c9116d [formerly 3afbeecdaecfb9ab7cea7e59db688639dbdad972]]]]]
Former-commit-id: 4c49c9116d
Former-commit-id: a02fa7bd3d [formerly 39f635354a] [formerly 69d7fe5cd0] [formerly d08f8152f1b26e2827b0f0b3a596a11a9b52a970 [formerly c5ea7dd8201ef99851ee8be6489272c0127fe903] [formerly 69d7fe5cd0 [formerly b17893d7e0]]]
Former-commit-id: 820b26cdf8689fe8f1b6e7ccb5b1c6c9a6063536 [formerly ba8ce43b0c907cff5e4697dc142aa31acfe21997] [formerly edfed65902 [formerly c25fc27e89]]
Former-commit-id: edfed65902
Former-commit-id: b0faa6b4b3
|
2012-11-07 15:36:44 -06:00 |
|
Roger Ferrel
|
551198e09b
|
Issue #1298 Changes for non-blocking ClearZoneGroupsDialog.
Change-Id: I26b270ccea9cd31f2948180eff33df75fbd95ea0
Former-commit-id: 0b075f029d [formerly d6d99f5e30] [formerly ee038e811c] [formerly ee038e811c [formerly a46535ee0c]] [formerly 0b075f029d [formerly d6d99f5e30] [formerly ee038e811c] [formerly ee038e811c [formerly a46535ee0c]] [formerly 65d10be5d6 [formerly ee038e811c [formerly a46535ee0c] [formerly 65d10be5d6 [formerly a0531fd85403c43226f5c7ed60d4c8ecdf1fc6d4]]]]]
Former-commit-id: 65d10be5d6
Former-commit-id: b1056cb349 [formerly b42d50faed] [formerly 42f453ffca] [formerly 11d1352e959287462331444e3e914616f2327a14 [formerly 2a9ce01552cb82c75c8d83ada1b390cf88194546] [formerly 42f453ffca [formerly 35f3a3953c]]]
Former-commit-id: 906573699fcddd7e933b33948ef270810fb086b1 [formerly b4cc1e5dfe5e0670423a5cce3ddd39aedbd7aa98] [formerly dda46f3046 [formerly f2f0d2320f]]
Former-commit-id: dda46f3046
Former-commit-id: bb99fc1786
|
2012-11-07 15:07:47 -06:00 |
|