From 4372a4e0d62519444790d26e7fd2a55365c20ef0 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Fri, 21 Sep 2012 11:11:24 -0500 Subject: [PATCH] Issue #1208 change density and mag handlers in d2d to not throw exceptions. Former-commit-id: f20812bc1196d966cadf2625e4080d4ce738630e [formerly f20812bc1196d966cadf2625e4080d4ce738630e [formerly b7c0ef15d9e8c27cd3ce646b393c6c44315eabef]] Former-commit-id: 3f4bfb8efecde36e79359dc8f8faad7136dbbdcf Former-commit-id: 6e8bca348f2a1a73867af9025d9613a248404283 --- .../com/raytheon/uf/viz/d2d/ui/actions/DensityHandler.java | 2 +- .../src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DensityHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DensityHandler.java index 8ab9ca185e..1e5ce692d1 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DensityHandler.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/DensityHandler.java @@ -81,7 +81,7 @@ public class DensityHandler extends AbstractHandler implements IElementUpdater { IDisplayPane[] panes = container.getDisplayPanes(); for (IDisplayPane pane : panes) { IRenderableDisplay disp = pane.getRenderableDisplay(); - if (disp != null) { + if (disp != null && disp instanceof ID2DRenderableDisplay) { ((ID2DRenderableDisplay) disp).setDensity(density); } } diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java index 4e613951fd..59e5f06137 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/MagHandler.java @@ -73,11 +73,12 @@ public class MagHandler extends AbstractHandler implements IElementUpdater { double magnification = Double.parseDouble((arg0 .getParameter("magnification"))); if (editor != null) { - if (magnification == 0.0f) magnification=0.1; + if (magnification == 0.0f) + magnification = 0.1; IDisplayPane[] panes = editor.getDisplayPanes(); for (IDisplayPane pane : panes) { IRenderableDisplay disp = pane.getRenderableDisplay(); - if (disp != null) { + if (disp != null && disp instanceof ID2DRenderableDisplay) { ((ID2DRenderableDisplay) disp) .setMagnification(magnification); }