13.5.1-20 baseline

Former-commit-id: 6ae21523e354f26dbf0a668239b75e9b679bbf1f
This commit is contained in:
Steve Harris 2013-09-03 09:58:18 -04:00
parent 5b643065e9
commit a60b097050

View file

@ -43,6 +43,7 @@ import com.raytheon.viz.ui.tools.AbstractTool;
* ------------ ---------- ----------- --------------------------
* Feb 23, 2007 chammack Initial Creation.
* Nov 3, 2009 3457 bsteffen Updated to change blend on all DisplayPanes, not just the active ones.
* Aug 30, 2013 DR 16555 D. Friedman Prevent NPE.
*
* </pre>
*
@ -65,7 +66,7 @@ public class ToggleTool extends AbstractTool {
ResourceList rscs = mapDescriptor.getResourceList();
for (ResourcePair rp : rscs) {
AbstractVizResource<?, ?> rsc = rp.getResource();
if (rsc.getCapabilities().hasCapability(
if (rsc != null && rsc.getCapabilities().hasCapability(
BlendableCapability.class)) {
rsc.getCapability(BlendableCapability.class).toggle();
}