Merge "Issue #1562 max's fix for topo with custom colormaps" into omaha_13.3.1

Former-commit-id: 1bc148b468 [formerly dbbad421db [formerly 0b617c32afd67c5f64efa89e18abfef0de51a00f]]
Former-commit-id: dbbad421db
Former-commit-id: a109ec4601
This commit is contained in:
Nate Jensen 2013-04-03 14:13:14 -05:00 committed by Gerrit Code Review
commit 3334d9b065

View file

@ -69,6 +69,7 @@ import com.raytheon.viz.core.drawables.ColorMapParameterFactory;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Feb 14, 2007 chammack Initial Creation.
* Apr 03, 2013 1562 mschenke Fix for custom colormaps
*
* </pre>
*
@ -140,10 +141,9 @@ public class TopoResource extends
ColorMapParameters existing = getCapability(ColorMapCapability.class)
.getColorMapParameters();
if (existing != null) {
PersistedParameters params = existing.getPersisted();
if (params != null) {
parameters.setColorMapMin(params.getColorMapMin());
parameters.setColorMapMax(params.getColorMapMax());
PersistedParameters persisted = existing.getPersisted();
if (persisted != null) {
parameters.applyPersistedParameters(persisted);
}
if (existing.getColorMap() != null) {