Commit graph

2310 commits

Author SHA1 Message Date
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
Greg Armendariz
1a04182d44 Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 7398504d85 [formerly d1fb06feb7] [formerly ecc9f77f42] [formerly 6b1989cb29 [formerly ecc9f77f42 [formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]]]
Former-commit-id: 6b1989cb29
Former-commit-id: 65b70ce223 [formerly fc6195bbf6] [formerly 515c934b42be211ce5f92cab2acdd2eb519d3d9f [formerly c46f04dd72]]
Former-commit-id: a084eb93b668c3922297767a4872577df1c23840 [formerly 9a1b44efdc]
Former-commit-id: 4b29a16298
2013-08-07 14:46: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
Greg Armendariz
7fb928e967 13.5.1-11 baseline
Former-commit-id: 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 814f7fdcdd [formerly c402dbf6e9] [formerly ea7b22500e] [formerly 4ec04083bd [formerly ea7b22500e [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]]]
Former-commit-id: 4ec04083bd
Former-commit-id: 4c20fc4977 [formerly 75f9f8df3f] [formerly f2fc00d3a51154c96e69230aaba5d4ce07cccb09 [formerly 26e58d8cdb]]
Former-commit-id: 4b97c9297a6132e1a64e7b28e4204a8cd32cdd79 [formerly f06ee47260]
Former-commit-id: 8bf2c1cc07
2013-08-07 14:34:27 -04:00
Greg Armendariz
0bb16ced54 13.5.1-10 baseline
Former-commit-id: 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly 9694f9390a [formerly e276b0fabe] [formerly 852455843f] [formerly acf7ced37b [formerly 852455843f [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]]]
Former-commit-id: acf7ced37b
Former-commit-id: 690ea2e228 [formerly 9ddb32967c] [formerly 55e2845c864335ebeda69be5a21e4f9deaffd22e [formerly 05282eac88]]
Former-commit-id: f92c8134fca60f550bc93797091c6154015f9683 [formerly f37ef8c24e]
Former-commit-id: 5998f47f57
2013-08-07 14:14:46 -04: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
Steve Harris
48c5fb1f4e Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 3573599aaf [formerly 1917c598bc] [formerly 72893066cc] [formerly 97ef150656 [formerly 72893066cc [formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]]]
Former-commit-id: 97ef150656
Former-commit-id: e680a0e630 [formerly 6ec0c65e84] [formerly 2b8530d5516361d757800e54b2cc11d91e3b78b4 [formerly b346666ef1]]
Former-commit-id: 37556376792a9859a1d670f73769f61cc7cbfa1d [formerly 834819949f]
Former-commit-id: a3f0e4c84b
2013-08-01 08:27:10 -05:00
Steve Harris
a7c6d3b46d 13.5.1-9 baseline
Former-commit-id: 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 1be9abc02f [formerly 778df21de9] [formerly 97fe6a670f] [formerly 6e60cd9a79 [formerly 97fe6a670f [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]]]
Former-commit-id: 6e60cd9a79
Former-commit-id: 7fc384a659 [formerly c7e7c838aa] [formerly 1facde304923c944b67d09bf0537810759f82aa7 [formerly bbb7f1dd49]]
Former-commit-id: dd4d7bf31c8224a969995ed35d8e37b50bb8a6d6 [formerly e16fce85ae]
Former-commit-id: ef41819406
2013-08-01 09:20:23 -04: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
Richard Peter
4af4e587e8 Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development
Former-commit-id: d0746350d7 [formerly 1a4c887b6f] [formerly 42248850a6] [formerly d0746350d7 [formerly 1a4c887b6f] [formerly 42248850a6] [formerly 6223ee42de [formerly 42248850a6 [formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]]]
Former-commit-id: 6223ee42de
Former-commit-id: 08f6dae69f [formerly 5b3944835a] [formerly 64a9689355af15f6e09574ae0fe2b065b687f3bb [formerly eb0e4c9a70]]
Former-commit-id: 664a5212e6f7f164b2d48097c1978b5dadbdd3a0 [formerly 0e0b92003b]
Former-commit-id: c50dee200f
2013-07-31 13:40:49 -05:00
Richard Peter
be84d709e4 Merge branch 'omaha_13.5.1' (13.5.1-8) into development
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly e439ecafe6 [formerly 464352f731] [formerly 26df62db53] [formerly f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]]]
Former-commit-id: f97a27796d
Former-commit-id: 7f46fbf78f [formerly a67f0bf2da] [formerly ea1df038b44fa6b4c0db240a0fb0b45969d773c0 [formerly 3f1e17765a]]
Former-commit-id: 9973bf82bd2bdd62c09a917e8fc0870c0a2147d1 [formerly 5314b90720]
Former-commit-id: 33d4f95c3e
2013-07-31 12:54:12 -05:00
Roger Ferrel
e2676f9ea2 Issue #2220 Implement Archive GUI's recompute sizes.
Change-Id: Ib80dadc33762a155d5b48bd9ae2e7cf5273f01ea

Former-commit-id: bee4dcef51 [formerly 6cbb931d5c] [formerly 7c8893cb7c] [formerly bee4dcef51 [formerly 6cbb931d5c] [formerly 7c8893cb7c] [formerly a5690f52e8 [formerly 7c8893cb7c [formerly 276d4fae3a5fb0fe152a62fdbb30d030096db4ca]]]]
Former-commit-id: a5690f52e8
Former-commit-id: 3fef1ed18f [formerly ea6974f1d0] [formerly aad0fb353c4423bba4b137cb53a6584bf4446e20 [formerly a310ce57b8]]
Former-commit-id: dc5fafae57d743007cccdd73286a22bb0d3aa75e [formerly b684b8ae36]
Former-commit-id: c997b59214
2013-07-31 09:55:58 -05:00
Ron Anderson
db13ebd4af Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10

Former-commit-id: c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly c0dc7d2e46 [formerly 4c61168660] [formerly 390f5b2439] [formerly 47b977cdec [formerly 390f5b2439 [formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]]]
Former-commit-id: 47b977cdec
Former-commit-id: d09f5d9d0b [formerly 17fef5a2ab] [formerly 114c4a17a51aff6ca84968879bde76a89a25803b [formerly 77e8cd467f]]
Former-commit-id: 4b829c11b6f4e18ec14b77c5131e7e5289d9eb74 [formerly e1a78db830]
Former-commit-id: e8ab3a860f
2013-07-31 09:00:07 -05:00
Richard Peter
8f8da04e54 Merge changes Ibb67b53b,I376f2970,Ie4dee73b into development
* changes:
  Issue #2227 Fix issue with swapping of melting layer product.
  Issue #1726 add swt to unit tests project for use when we need it
  Issue #2148 moved all registering of radar products to spring files instead of static methods in Java classes


Former-commit-id: 49d4df407c [formerly d5e0eadb2a] [formerly 57a57ad677] [formerly 49d4df407c [formerly d5e0eadb2a] [formerly 57a57ad677] [formerly 618fabe94f [formerly 57a57ad677 [formerly a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8]]]]
Former-commit-id: 618fabe94f
Former-commit-id: 625349673d [formerly e82bec7b87] [formerly 6e4d3a6ae05aa613e1b182e6a074108fda083abc [formerly 4a668cf47d]]
Former-commit-id: a6af9d8533f376c07f7a5005885bad2024de6348 [formerly 9bd980541d]
Former-commit-id: 6edb257ca5
2013-07-30 21:32:42 -05:00
Matt Nash
50d5facbd7 Issue #2227 Fix issue with swapping of melting layer product.
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d

Former-commit-id: 411bb7bef9 [formerly 3c0eb24d51] [formerly 91afb50333] [formerly 411bb7bef9 [formerly 3c0eb24d51] [formerly 91afb50333] [formerly b308e86105 [formerly 91afb50333 [formerly fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02]]]]
Former-commit-id: b308e86105
Former-commit-id: 529e15bf44 [formerly 1acd38ced6] [formerly 253e6c7e43e23ad4a1926485184a895f118c99ca [formerly 855671b490]]
Former-commit-id: 45e53bbe78d7660a3dc74f85376372b2fba8e9f0 [formerly 32bdbdab0f]
Former-commit-id: bc3fc824d3
2013-07-30 10:47:37 -05:00
Ron Anderson
6271646c57 Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
Former-commit-id: a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly a5b4564bf4 [formerly d569641f3e] [formerly ca94d4ffac] [formerly 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]]]
Former-commit-id: 43b5d2193b
Former-commit-id: b407c24483 [formerly 129040ce9b] [formerly 9325a6cfb92f4c6f3ed0e145dbd8e2e7fb061d80 [formerly 8b1eb58de9]]
Former-commit-id: 91076aec36920366d2ab70aa9a8b7fb611ca6594 [formerly 201d9542fe]
Former-commit-id: 9e8a94ae4f
2013-07-30 08:35:06 -05:00
Ron Anderson
f4abc8dfb6 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 7cbf6290b7 [formerly a5da46c360] [formerly ebdfbebcfc] [formerly 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]]]
Former-commit-id: 4aceedceb5
Former-commit-id: 8302ca2e4c [formerly ddecdbf0b8] [formerly 74a9faa9f68a1d5677b8f681b73ca7605d1907ac [formerly b4de3f23a6]]
Former-commit-id: 031680b5c9244735bc01929258d5dedcf60b441e [formerly 493d497091]
Former-commit-id: 1c1340fe37
2013-07-29 18:12:24 -05:00
Ron Anderson
fc34f08130 Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development
Former-commit-id: 1d834d8d2f [formerly 9574e1237e] [formerly 35f5b04522] [formerly 1d834d8d2f [formerly 9574e1237e] [formerly 35f5b04522] [formerly fd43f74212 [formerly 35f5b04522 [formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]]]
Former-commit-id: fd43f74212
Former-commit-id: 8c8be0441e [formerly 972f1b02fc] [formerly 32ddad57d2fb004dabb2608d41dde4b5a0348dd6 [formerly 890bb4d832]]
Former-commit-id: b06a6e9d52757f8422d409f8facc85dc9d914653 [formerly 247372ad8f]
Former-commit-id: c4b1d81365
2013-07-29 18:11:30 -05:00
Ron Anderson
52161457c6 Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b

Former-commit-id: 681492f139 [formerly 19d38c48c5] [formerly f028f111b0] [formerly 681492f139 [formerly 19d38c48c5] [formerly f028f111b0] [formerly f3a8ccf158 [formerly f028f111b0 [formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]]]
Former-commit-id: f3a8ccf158
Former-commit-id: a6b9fbb808 [formerly 1de5b051e2] [formerly c81dcca785585c8d2a5eca4e0c836bcfe52ee5f2 [formerly 3841c55a28]]
Former-commit-id: 0050071ea741441fa969c966ca2e25a8ca5ba26e [formerly c5ad5b1143]
Former-commit-id: c4829c0c4c
2013-07-29 17:19:07 -05:00
Bryan Kowal
8fe7a3434e Issue #2164 - remove unnecessary junit dependency
Former-commit-id: 45b945e3be [formerly 204fa65c8f] [formerly a0f1944796] [formerly 45b945e3be [formerly 204fa65c8f] [formerly a0f1944796] [formerly 77473d75b5 [formerly a0f1944796 [formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]]]
Former-commit-id: 77473d75b5
Former-commit-id: be6c3ef08b [formerly 02bba2ae9c] [formerly fe8947abdbbfbad364cff667293097397b9f31fa [formerly 686affce01]]
Former-commit-id: ee6875c5c59e75c92b66ea9f7cf4394541f95a6b [formerly 892b3e6126]
Former-commit-id: 03e6faba0f
2013-07-29 16:31:15 -05:00
Lee Venable
0a2c9f01c0 Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development
Former-commit-id: 85997c99ec [formerly c59237a292] [formerly f246c961a2] [formerly 85997c99ec [formerly c59237a292] [formerly f246c961a2] [formerly 80a147990e [formerly f246c961a2 [formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]]]
Former-commit-id: 80a147990e
Former-commit-id: 300fec364a [formerly 8dcbc5d137] [formerly 55a8a98aca4bdb2abe9c662cd9400379e4187e45 [formerly c78a13d744]]
Former-commit-id: e4f6213c165ef947dbbec3226da2f813e97c5192 [formerly 5aaece8f93]
Former-commit-id: a7a15945df
2013-07-29 15:06:42 -05:00
Matt Nash
bc64460a5d Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d

Former-commit-id: c04dfe7490 [formerly 8e75837289] [formerly 74ccbf163d] [formerly c04dfe7490 [formerly 8e75837289] [formerly 74ccbf163d] [formerly 0c98b5e9de [formerly 74ccbf163d [formerly 06fe93289dd6832fe7b2b78e6d15f15f229c2532]]]]
Former-commit-id: 0c98b5e9de
Former-commit-id: 799c643595 [formerly 65c3bb4ba4] [formerly 410563425e46c9739e4ae4400673f00e318d3e9a [formerly e7fddc8df0]]
Former-commit-id: cf407779b042d0dba5a9f30897cbd47c7230dee4 [formerly 96f9eb70e2]
Former-commit-id: 644f958dc1
2013-07-29 14:47:19 -05:00
Brad Gonzales
27535bcd85 Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes.
Change-Id: I3239daa25a4bc2116ff3423bfa71afe3947faff0

Former-commit-id: 7ad2b1c953 [formerly a053fc85f7] [formerly 8a6ab05561] [formerly 7ad2b1c953 [formerly a053fc85f7] [formerly 8a6ab05561] [formerly 18201a0153 [formerly 8a6ab05561 [formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]]]
Former-commit-id: 18201a0153
Former-commit-id: 645d36f98f [formerly 02bb327341] [formerly df7ab4ff8c4d4e0fc3ec4b4ec3223eb60f7bf884 [formerly 22c62b6982]]
Former-commit-id: 5c7e59dfe60a4bcf713bb02843323528371b08bf [formerly 95c15b253d]
Former-commit-id: 9e62ae42a3
2013-07-29 11:56:10 -05:00
Lee Venable
685ca5ce2f Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development
Former-commit-id: 6698d5d65f [formerly 5d32fd30df] [formerly a42d4bb0cc] [formerly 6698d5d65f [formerly 5d32fd30df] [formerly a42d4bb0cc] [formerly 30baa25afa [formerly a42d4bb0cc [formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]]]
Former-commit-id: 30baa25afa
Former-commit-id: d340bb792b [formerly 8f3b40e732] [formerly 04d138d3d113b1e2230601f125d0cb7b9687aa4a [formerly 2af73d09f9]]
Former-commit-id: a9c94e9db39deb852033d497b7611835ff464ad4 [formerly d4c75a38fd]
Former-commit-id: 7fe76ccf80
2013-07-29 11:52:16 -05:00
Lee Venable
3959eaf9eb Merge "Issue #2217 - Added better error handling" into development
Former-commit-id: c71c388b1c [formerly d97698519d] [formerly f3c4306987] [formerly c71c388b1c [formerly d97698519d] [formerly f3c4306987] [formerly ccf6962224 [formerly f3c4306987 [formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]]]
Former-commit-id: ccf6962224
Former-commit-id: 4d36f90396 [formerly 824b855490] [formerly df76bd2f6d088b036ea13625efcf10dec752bfc4 [formerly e2002c1d7e]]
Former-commit-id: 0a31e4aa142dea52d8f35082d7e5dab8a7fd6baa [formerly 68b0385add]
Former-commit-id: 83193a51e7
2013-07-29 11:44:59 -05:00
Mike Duff
6782829661 Issue #2232 - Fix index out of bounds exception in Sub Manager Table
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0

Former-commit-id: 46a39fd7bb [formerly 83c79750af] [formerly 974d5a05b2] [formerly 46a39fd7bb [formerly 83c79750af] [formerly 974d5a05b2] [formerly 3ab275aea4 [formerly 974d5a05b2 [formerly baa8d402efb4aeff839e06fd180a73a857fd0766]]]]
Former-commit-id: 3ab275aea4
Former-commit-id: 180e113d2d [formerly df83cf2ffe] [formerly 9c0ed0e446be1daad57db09fc0150b4cdaca314f [formerly 579daeaebb]]
Former-commit-id: f56f2231481cefbe7da74fd40287455a9b9772cd [formerly 6683a5c949]
Former-commit-id: e01702f842
2013-07-29 09:55:51 -05:00
Richard Peter
de828f1f68 Merge "Issue #2189 Set size properly on GLFont" into development
Former-commit-id: fc5c8fe510 [formerly 951484545a] [formerly 30c92f3fc7] [formerly fc5c8fe510 [formerly 951484545a] [formerly 30c92f3fc7] [formerly 196f5f4a5d [formerly 30c92f3fc7 [formerly 7f7762b889e7b86231f22abb89dd94d630c0d291]]]]
Former-commit-id: 196f5f4a5d
Former-commit-id: b40512d805 [formerly 44bcd7145d] [formerly 435dcb24e4fa3b4b4a8e2c90d6f0485a3757375d [formerly 8ba5944134]]
Former-commit-id: 3c08172d7165af6fb308bd6241783dc861ce352d [formerly f7c537d79d]
Former-commit-id: f16bec4faf
2013-07-26 14:34:46 -05:00
Max Schenkelberg
c8941ac314 Issue #2189 Set size properly on GLFont
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7

Former-commit-id: dcd0242c3a [formerly 1e4fe87002] [formerly 970f2c1373] [formerly dcd0242c3a [formerly 1e4fe87002] [formerly 970f2c1373] [formerly 564d6ee664 [formerly 970f2c1373 [formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]]]
Former-commit-id: 564d6ee664
Former-commit-id: f3f82761a0 [formerly e1c5959762] [formerly 0dccb9e07f90ef5a8f408098b1747f15fc92c249 [formerly ef01f6db81]]
Former-commit-id: c641ac55317b427710b4a6f5b5b61db18ec8e381 [formerly 9101a9e190]
Former-commit-id: ba19a58428
2013-07-26 13:14:48 -05:00
Richard Peter
0a552741f0 Merge "Issue #2112 Fix volume browser sounding errors." into development
Former-commit-id: 22b017edfa [formerly 008f2f98ad] [formerly 8a4506e794] [formerly 22b017edfa [formerly 008f2f98ad] [formerly 8a4506e794] [formerly c57aa39ddd [formerly 8a4506e794 [formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]]]
Former-commit-id: c57aa39ddd
Former-commit-id: 426003a524 [formerly 5c59b1257c] [formerly fd60a0ca22c8a42ac41c45ecab3700ce2597539c [formerly 5d53ab253d]]
Former-commit-id: 3878b367383b994d611c829fb13e85a1787be7c1 [formerly 33129350c8]
Former-commit-id: a81eb7c908
2013-07-26 10:23:08 -05:00
Greg Armendariz
34048b9bcf Issue #2207 - Additional test fixes
Former-commit-id: 76b0a2da3d [formerly 0f4595d842] [formerly afe9191fea] [formerly 76b0a2da3d [formerly 0f4595d842] [formerly afe9191fea] [formerly b5d509fc4a [formerly afe9191fea [formerly 38531ca3d8336801663d7d664d0578497dff8911]]]]
Former-commit-id: b5d509fc4a
Former-commit-id: f6794acf79 [formerly 599458dbb5] [formerly ec0c985279a053426670da8dd11bade116fad500 [formerly 56881355ed]]
Former-commit-id: 1b8c8eddc70e008ea821a52b1b033d35335bbf15 [formerly 06f3e23394]
Former-commit-id: 89a582f766
2013-07-26 09:24:43 -05:00
Greg Armendariz
b7e1f98c42 Merge "Issue #2207 - Remove reference to missing tests directory" into development
Former-commit-id: 1762662c99 [formerly d83157b9d1] [formerly 69b346a195] [formerly 1762662c99 [formerly d83157b9d1] [formerly 69b346a195] [formerly 66caca12a4 [formerly 69b346a195 [formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]]]
Former-commit-id: 66caca12a4
Former-commit-id: 344ee588b3 [formerly c232be59ff] [formerly 12218db6b46469b81fc6897d0641bccf755a679c [formerly 8a5d9e4c70]]
Former-commit-id: 2de45cd716121d359e730a23bc55983695702d74 [formerly f9a5b107d4]
Former-commit-id: 4336f1b889
2013-07-26 09:05:53 -05:00