Greg Armendariz
9a1b44efdc
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: ecc9f77f42
[formerly ecc9f77f42
[formerly abb16b014694113cd7f2582542fd0d0f54a2da4e]]
Former-commit-id: 6b1989cb29
Former-commit-id: c46f04dd72
2013-08-07 14:46:30 -05:00
Ron Anderson
f8ad742697
Merge "Issue #2235 Added Caching version of TopoQuery. Change-Id: I0e17028921faa40e85134c79074655900bd8358c" into development
...
Former-commit-id: 216b2a5c86
[formerly 216b2a5c86
[formerly 4e9a02fcd4931d2a26b10b3e695a7fa99d1ef972]]
Former-commit-id: 0a9068e6d3
Former-commit-id: fcb78e78d3
2013-08-07 14:05:36 -05:00
Greg Armendariz
f06ee47260
13.5.1-11 baseline
...
Former-commit-id: ea7b22500e
[formerly ea7b22500e
[formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]]
Former-commit-id: 4ec04083bd
Former-commit-id: 26e58d8cdb
2013-08-07 14:34:27 -04:00
Greg Armendariz
f37ef8c24e
13.5.1-10 baseline
...
Former-commit-id: 852455843f
[formerly 852455843f
[formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]]
Former-commit-id: acf7ced37b
Former-commit-id: 05282eac88
2013-08-07 14:14:46 -04:00
Nate Jensen
f8bd55d407
Issue #1561 more efficient query of GFE files
...
Change-Id: Ib1715d76749bbe75bd8c1ad03263303c14500eb9
Former-commit-id: cdfea29b16
[formerly cdfea29b16
[formerly 41ae249c3b75684c44d7b0b0624ebdecdbf656ee]]
Former-commit-id: 5c7dc36583
Former-commit-id: d520081243
2013-08-07 13:12:48 -05:00
Ben Steffensmeier
16c0832b4f
Issue #2235 Added Caching version of TopoQuery.
...
Change-Id: I0e17028921faa40e85134c79074655900bd8358c
Former-commit-id: 2ecba23bb9
[formerly 2ecba23bb9
[formerly 2c989747b8c9d1b7529c09c75c76bcb0ad90dbe7]]
Former-commit-id: 2a51ddd697
Former-commit-id: 15ddd45995
2013-08-06 18:27:21 -05:00
Nate Jensen
22861240c8
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: a1a9a4751a
[formerly a1a9a4751a
[formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]
Former-commit-id: 27dd27a73f
Former-commit-id: 15006517a2
2013-08-06 17:17:53 -05:00
Nate Jensen
5c3310851b
Merge "Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage" into development
...
Former-commit-id: 0bf9eed643
[formerly 0bf9eed643
[formerly 311a4e792edd9c1a83fe2debfee1a00e43f12807]]
Former-commit-id: e7949c04ad
Former-commit-id: 2bd358ff19
2013-08-06 14:14:27 -05:00
Richard Peter
cb58571e5f
Merge "Issue #2221 - Changes to have select configuration files for retention and case creation." into development
...
Former-commit-id: d6041529db
[formerly d6041529db
[formerly 99422acbda91c8f499af9c4ae57b136a1469fdfa]]
Former-commit-id: 301556213a
Former-commit-id: 5349f48a34
2013-08-06 12:46:32 -05:00
Max Schenkelberg
3d5f35d792
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: dda69d36b7
[formerly dda69d36b7
[formerly 2e52921b21ecaeaa11be8277e264446686d65338]]
Former-commit-id: a18686135c
Former-commit-id: 75ae62fd9a
2013-08-06 12:37:52 -05:00
Nate Jensen
bcb21350cf
Issue #2142 fix logback config
...
Change-Id: I6e708cb251f6e4564ede0ba90f2cd906eb16a998
Former-commit-id: 05eba98d50
[formerly 05eba98d50
[formerly a200e86f382e532c1b60c907b4a0b00d80688917]]
Former-commit-id: 148153eddf
Former-commit-id: b04d075d18
2013-08-06 11:39:34 -05:00
Nate Jensen
0abec57d0d
Issue #2228 use TMemoryInputTransport for slight efficiency improvement
...
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf
Former-commit-id: d4590cbf5e
[formerly d4590cbf5e
[formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]
Former-commit-id: 842f15ae12
Former-commit-id: 7d17d965a3
2013-08-06 09:52:02 -05:00
Lee Venable
f1b42ae10e
Merge "Issue #2143 . Changes for non-blocking SCAN dialogs." into development
...
Former-commit-id: a2ae8fe5de
[formerly a2ae8fe5de
[formerly 8a893db2a506ade83e6cd22355893138c32cdfea]]
Former-commit-id: 2a74881571
Former-commit-id: 8f0fa192bb
2013-08-06 09:32:21 -05:00
Nate Jensen
7a045f1d12
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: fcb6f59a3f
[formerly fcb6f59a3f
[formerly 48e80dd9732e0b20f211fa456c8bec81b4495555]]
Former-commit-id: 28ffe0f3f1
Former-commit-id: 51ce39012d
2013-08-06 08:35:50 -05:00
Max Schenkelberg
71ee818ed0
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: 474429aaee
[formerly 474429aaee
[formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]
Former-commit-id: f08e2d5edc
Former-commit-id: fc60d55637
2013-08-05 16:46:02 -05:00
Roger Ferrel
4a8ece9a15
Issue #2221 - Changes to have select configuration files for retention and case creation.
...
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f
Former-commit-id: 19d23ae929
[formerly 19d23ae929
[formerly 30f55459d26e3d1118610959e98e475ede0e9f47]]
Former-commit-id: b3f9ea79af
Former-commit-id: 2be8799f51
2013-08-05 16:20:46 -05:00
Richard Peter
8eada4e873
Merge "Issue #2220 Removed synchronized from most methods." into development
...
Former-commit-id: d79c7c1b84
[formerly d79c7c1b84
[formerly 5d93f17fc5fcb0cd98e5b4bf3681fc9bc244b993]]
Former-commit-id: 084d39c6f3
Former-commit-id: b23a59a114
2013-08-05 14:27:33 -05:00
Ben Steffensmeier
977e135e17
Issue #2202 Add edex specific connectivity checking.
...
Change-Id: I003957001ed608d1054ab2a87019b018f8996d36
Former-commit-id: cfd9cb0b7d
[formerly cfd9cb0b7d
[formerly b8e5323b70db03817c6c750746f29cc550cbc815]]
Former-commit-id: fac4cdc131
Former-commit-id: 66ce1a9c68
2013-08-05 11:17:23 -05:00
Slav Korolev
2c1a27a76c
Issue #2143 . Changes for non-blocking SCAN dialogs.
...
Change-Id: I0afcaced20e0cc76cbcb2d64a24fcfc3022dc1d1
Former-commit-id: 0c0941ad5d
[formerly 0c0941ad5d
[formerly 5539da3d19fa0c174eba1a8733e946ca10e5f4bb]]
Former-commit-id: 4afde7addb
Former-commit-id: 5d180b2e58
2013-08-02 09:53:56 -04:00
Roger Ferrel
9a51923f38
Issue #2220 Removed synchronized from most methods.
...
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858
Former-commit-id: 4cdb105622
[formerly 4cdb105622
[formerly 6857a74daf7ac43aa76715aff31dfbed04ff0b0b]]
Former-commit-id: 1a66522590
Former-commit-id: 51b36a0612
2013-08-01 13:46:21 -05:00
Steve Harris
834819949f
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Former-commit-id: 72893066cc
[formerly 72893066cc
[formerly 64b7a7f6a035d5832f2338d854780b16d22306db]]
Former-commit-id: 97ef150656
Former-commit-id: b346666ef1
2013-08-01 08:27:10 -05:00
Steve Harris
e16fce85ae
13.5.1-9 baseline
...
Former-commit-id: 97fe6a670f
[formerly 97fe6a670f
[formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]]
Former-commit-id: 6e60cd9a79
Former-commit-id: bbb7f1dd49
2013-08-01 09:20:23 -04:00
Richard Peter
ad321f41df
Merge "Issue #2236 Merged Mike's Code" into development
...
Former-commit-id: 733c4806e8
[formerly 733c4806e8
[formerly 837c11d7cb97b36751b37c4468ff00b0e261b870]]
Former-commit-id: 563abed925
Former-commit-id: 6a6ccaf622
2013-07-31 16:33:01 -05:00
Richard Peter
67ddc717d4
Merge "Issue #2220 Implement Archive GUI's recompute sizes." into development
...
Former-commit-id: 9acfea6525
[formerly 9acfea6525
[formerly 080503d71a2b4e40f8ef7985ef01142c2fa29ce0]]
Former-commit-id: d1fa0bb7c8
Former-commit-id: fe0573a141
2013-07-31 16:31:24 -05:00
Lee Venable
22a6dbde4d
Merge "Issue #2227 fix weird swapping behavior on 4 panel" into development
...
Former-commit-id: c1c97f0a72
[formerly c1c97f0a72
[formerly 8313addc8b417aa769264f95f2b22fd65426e88d]]
Former-commit-id: c0d3ef6e8c
Former-commit-id: 016cd9a487
2013-07-31 16:29:55 -05:00
Dave Hladky
a6bff7d97f
Issue #2236 Merged Mike's Code
...
Change-Id: I78943ceee3aeea1eeb6d815fefd3e82b46d677a6
Former-commit-id: e21cc84d16
[formerly e21cc84d16
[formerly 7cc09247bc4166f9586867fba097b4c40577464d]]
Former-commit-id: db7c81a1df
Former-commit-id: fe9e969142
2013-07-31 16:16:47 -05:00
Matt Nash
c3357ca6d6
Issue #2227 fix weird swapping behavior on 4 panel
...
Change-Id: I87c35349e7aa6b91974f2c8f5edf2531d72a806f
Former-commit-id: 341138f01c
[formerly 341138f01c
[formerly 83eaaa8e7635c15905f2028dd9f91425bc54826f]]
Former-commit-id: a4b4177199
Former-commit-id: 7092cd385b
2013-07-31 14:50:42 -05:00
Richard Peter
0e0b92003b
Merge "Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes." into development
...
Former-commit-id: 42248850a6
[formerly 42248850a6
[formerly d85dd6c0b1c657bc2ff23c461370fbc480656229]]
Former-commit-id: 6223ee42de
Former-commit-id: eb0e4c9a70
2013-07-31 13:40:49 -05:00
Richard Peter
5314b90720
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: 26df62db53
[formerly 26df62db53
[formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]
Former-commit-id: f97a27796d
Former-commit-id: 3f1e17765a
2013-07-31 12:54:12 -05:00
Roger Ferrel
b684b8ae36
Issue #2220 Implement Archive GUI's recompute sizes.
...
Change-Id: Ib80dadc33762a155d5b48bd9ae2e7cf5273f01ea
Former-commit-id: 7c8893cb7c
[formerly 7c8893cb7c
[formerly 276d4fae3a5fb0fe152a62fdbb30d030096db4ca]]
Former-commit-id: a5690f52e8
Former-commit-id: a310ce57b8
2013-07-31 09:55:58 -05:00
Ron Anderson
e1a78db830
Issue #2239 fixed scaling of MakeHazard maps when polygons cross the date line
...
Change-Id: Idd3745f141b78c74a39cf99746acb45d5f143b10
Former-commit-id: 390f5b2439
[formerly 390f5b2439
[formerly f4feae82505c29bc49113682d2cd584ec3ed6233]]
Former-commit-id: 47b977cdec
Former-commit-id: 77e8cd467f
2013-07-31 09:00:07 -05:00
Richard Peter
9bd980541d
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: 57a57ad677
[formerly 57a57ad677
[formerly a454e0e19a3f4eca2c6b0a797de0aacb3d2934c8]]
Former-commit-id: 618fabe94f
Former-commit-id: 4a668cf47d
2013-07-30 21:32:42 -05:00
Matt Nash
32bdbdab0f
Issue #2227 Fix issue with swapping of melting layer product.
...
Change-Id: Ibb67b53ba29f5a24714e2852602fd0b54d811b6d
Former-commit-id: 91afb50333
[formerly 91afb50333
[formerly fc6ff0d7e60d82c8ca0d67cf96f26cde23ad0f02]]
Former-commit-id: b308e86105
Former-commit-id: 855671b490
2013-07-30 10:47:37 -05:00
Ron Anderson
201d9542fe
Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development
...
Former-commit-id: ca94d4ffac
[formerly ca94d4ffac
[formerly b286c654293e9b7bc11930953118b1d86da946dc]]
Former-commit-id: 43b5d2193b
Former-commit-id: 8b1eb58de9
2013-07-30 08:35:06 -05:00
Ron Anderson
493d497091
Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay.
...
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c
Former-commit-id: ebdfbebcfc
[formerly ebdfbebcfc
[formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]
Former-commit-id: 4aceedceb5
Former-commit-id: b4de3f23a6
2013-07-29 18:12:24 -05:00
Ron Anderson
247372ad8f
Merge "Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped" into development
...
Former-commit-id: 35f5b04522
[formerly 35f5b04522
[formerly 5188a208a6b66eb024db64efeb8a6409c57d4a64]]
Former-commit-id: fd43f74212
Former-commit-id: 890bb4d832
2013-07-29 18:11:30 -05:00
Ron Anderson
c5ad5b1143
Issue #1907 and #1908 fixed sampling a attribute dispaly when DataStoreResource is cropped
...
Change-Id: I8700442003c686916a926509b76ca9dd96d42b1b
Former-commit-id: f028f111b0
[formerly f028f111b0
[formerly 7a9efa6a0b9ca848a9f8445f1aeef9a278c09ee7]]
Former-commit-id: f3a8ccf158
Former-commit-id: 3841c55a28
2013-07-29 17:19:07 -05:00
Bryan Kowal
892b3e6126
Issue #2164 - remove unnecessary junit dependency
...
Former-commit-id: a0f1944796
[formerly a0f1944796
[formerly 8e7229a41ec6b5816a27f86a37e5d183cd0d1925]]
Former-commit-id: 77473d75b5
Former-commit-id: 686affce01
2013-07-29 16:31:15 -05:00
Lee Venable
5aaece8f93
Merge "Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical" into development
...
Former-commit-id: f246c961a2
[formerly f246c961a2
[formerly 1f7a3d63a890934875a59a454e910bac94cdc671]]
Former-commit-id: 80a147990e
Former-commit-id: c78a13d744
2013-07-29 15:06:42 -05:00
Matt Nash
96f9eb70e2
Issue #2227 Fix issue with changing scales for melting layer. Small refactor to make things more logical
...
Change-Id: I37269b4dd9e09ea6f4a8ad5c95f1620a462f3f5d
Former-commit-id: 74ccbf163d
[formerly 74ccbf163d
[formerly 06fe93289dd6832fe7b2b78e6d15f15f229c2532]]
Former-commit-id: 0c98b5e9de
Former-commit-id: e7fddc8df0
2013-07-29 14:47:19 -05:00
Brad Gonzales
95c15b253d
Issue #2196 changed wfoRegistry mode to devWfoRegistry mode. exclude crawler and harvester from wfo modes.
...
Change-Id: I3239daa25a4bc2116ff3423bfa71afe3947faff0
Former-commit-id: 8a6ab05561
[formerly 8a6ab05561
[formerly 9bea23cc83e7262721efa4fef9b573d4dd540502]]
Former-commit-id: 18201a0153
Former-commit-id: 22c62b6982
2013-07-29 11:56:10 -05:00
Lee Venable
d4c75a38fd
Merge "Issue #2232 - Fix index out of bounds exception in Sub Manager Table" into development
...
Former-commit-id: a42d4bb0cc
[formerly a42d4bb0cc
[formerly d49617f4acec37ddbaa0ec1d91306687a35531b0]]
Former-commit-id: 30baa25afa
Former-commit-id: 2af73d09f9
2013-07-29 11:52:16 -05:00
Lee Venable
68b0385add
Merge "Issue #2217 - Added better error handling" into development
...
Former-commit-id: f3c4306987
[formerly f3c4306987
[formerly 880308a45215aba37e9f6fa367f0848cdbb0da51]]
Former-commit-id: ccf6962224
Former-commit-id: e2002c1d7e
2013-07-29 11:44:59 -05:00
Mike Duff
6683a5c949
Issue #2232 - Fix index out of bounds exception in Sub Manager Table
...
Change-Id: Id61f6c2ddccb965a236bf9a99412e6f6cca8cae0
Former-commit-id: 974d5a05b2
[formerly 974d5a05b2
[formerly baa8d402efb4aeff839e06fd180a73a857fd0766]]
Former-commit-id: 3ab275aea4
Former-commit-id: 579daeaebb
2013-07-29 09:55:51 -05:00
Richard Peter
f7c537d79d
Merge "Issue #2189 Set size properly on GLFont" into development
...
Former-commit-id: 30c92f3fc7
[formerly 30c92f3fc7
[formerly 7f7762b889e7b86231f22abb89dd94d630c0d291]]
Former-commit-id: 196f5f4a5d
Former-commit-id: 8ba5944134
2013-07-26 14:34:46 -05:00
Max Schenkelberg
9101a9e190
Issue #2189 Set size properly on GLFont
...
Change-Id: Ib7321dfada582f4cbb05416428bd0c9639a905f7
Former-commit-id: 970f2c1373
[formerly 970f2c1373
[formerly 77d6ace9b601558ece1bf5ea724ef2f08df0112a]]
Former-commit-id: 564d6ee664
Former-commit-id: ef01f6db81
2013-07-26 13:14:48 -05:00
Richard Peter
33129350c8
Merge "Issue #2112 Fix volume browser sounding errors." into development
...
Former-commit-id: 8a4506e794
[formerly 8a4506e794
[formerly 019b1d63f11c9d1d57593e26f939d6b089730693]]
Former-commit-id: c57aa39ddd
Former-commit-id: 5d53ab253d
2013-07-26 10:23:08 -05:00
Greg Armendariz
06f3e23394
Issue #2207 - Additional test fixes
...
Former-commit-id: afe9191fea
[formerly afe9191fea
[formerly 38531ca3d8336801663d7d664d0578497dff8911]]
Former-commit-id: b5d509fc4a
Former-commit-id: 56881355ed
2013-07-26 09:24:43 -05:00
Greg Armendariz
f9a5b107d4
Merge "Issue #2207 - Remove reference to missing tests directory" into development
...
Former-commit-id: 69b346a195
[formerly 69b346a195
[formerly 3cf75f2b1a2fe5c2b94fcabf0b54038fccfa1724]]
Former-commit-id: 66caca12a4
Former-commit-id: 8a5d9e4c70
2013-07-26 09:05:53 -05:00
Greg Armendariz
482275acb7
Issue #2207 - Remove reference to missing tests directory
...
Former-commit-id: 8be27acdf2
[formerly 8be27acdf2
[formerly 2f7e8e5d498fd96f60ddf3ae192cadc705abaf5c]]
Former-commit-id: f3d82d8e82
Former-commit-id: fedae5495f
2013-07-26 08:59:41 -05:00