From 58c92ee18607719a8c0d1ce53e03513079dee039 Mon Sep 17 00:00:00 2001 From: Steve Harris Date: Wed, 4 Sep 2013 14:13:29 -0400 Subject: [PATCH] 13.5.2-3 baseline Former-commit-id: 7008da4acd6257e7cd5cf05676212f4069259976 [formerly 91fb128c17f415fbfb4c03325ea9e68dbfa7beab] [formerly 9fdd0e51a0b365c15a78cb41b8830b1012c6b6d8] [formerly 7008da4acd6257e7cd5cf05676212f4069259976 [formerly 91fb128c17f415fbfb4c03325ea9e68dbfa7beab] [formerly 9fdd0e51a0b365c15a78cb41b8830b1012c6b6d8] [formerly bae0a20b8ef305d35dea94076d06d271f6bf737e [formerly 9fdd0e51a0b365c15a78cb41b8830b1012c6b6d8 [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]]]] Former-commit-id: bae0a20b8ef305d35dea94076d06d271f6bf737e Former-commit-id: c2326316393aad1e8c6f518cba2675df743ce7d5 [formerly 8ac02ce922ebd6aa6aeb534b1e50ef8304b59aee] [formerly 6d2b921e8731c04bdf279dff1768af30f0c643a6 [formerly c666ac728383e0c0b70300f9715c32848bde5189]] Former-commit-id: 4d570483a8273c1504954f4ab46c44871ea3dc74 [formerly ccc509525187bea69835dba15f7dd0b7c1ac5ed8] Former-commit-id: 41a6eebf23ba6ef6c12c01cfa9522c914e10908a --- .../uf/viz/core/rsc/tools/GenericToolsResourceData.java | 5 +++-- .../src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java | 3 ++- deltaScripts/13.5.2/addBufrmosDataURI.sh | 0 3 files changed, 5 insertions(+), 3 deletions(-) mode change 100644 => 100755 deltaScripts/13.5.2/addBufrmosDataURI.sh diff --git a/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java b/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java index dfc28e204f..94ff2abc70 100644 --- a/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java +++ b/cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java @@ -48,6 +48,7 @@ import com.raytheon.viz.core.ColorUtil; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 21, 2013 1638 mschenke Renamed to better represent purpose + * Aug 29, 2103 DR 16550 D. Friedman Fix reflection constructor args * * * @@ -101,7 +102,7 @@ public class GenericToolsResourceData> public T construct(LoadProperties loadProperties, IDescriptor descriptor) throws VizException { try { - Class[] ctorParams = new Class[] { this.getClass(), + Class[] ctorParams = new Class[] { GenericToolsResourceData.class, LoadProperties.class }; Object[] ctorArgs = new Object[] { this, loadProperties }; @@ -110,7 +111,7 @@ public class GenericToolsResourceData> ctor = classT.getConstructor(ctorParams); } catch (NoSuchMethodException e) { // check for ctor with additional descriptor parameter - ctorParams = new Class[] { this.getClass(), + ctorParams = new Class[] { GenericToolsResourceData.class, LoadProperties.class, MapDescriptor.class }; ctorArgs = new Object[] { this, loadProperties, descriptor }; ctor = classT.getConstructor(ctorParams); diff --git a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java index 5e794b1c4e..bab5c079f6 100644 --- a/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java +++ b/cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java @@ -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. * * * @@ -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(); } diff --git a/deltaScripts/13.5.2/addBufrmosDataURI.sh b/deltaScripts/13.5.2/addBufrmosDataURI.sh old mode 100644 new mode 100755