xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master_13.5.2' into omaha_13.5.2

Browse source 
Former-commit-id: 20515f3382 [formerly d002ceea4d] [formerly f53ac4645b] [formerly cdc4971010 [formerly f53ac4645b [formerly 5d8e754f6958fe35dc99df47f8d5a89f133773c8]]]
Former-commit-id: cdc4971010
Former-commit-id: d155c1fccceb88e90d7805bf327adf3da932e1f8 [formerly b51dd7824a]
Former-commit-id: 57db023bfd
This commit is contained in:
Steve Harris 2013-09-04 13:23:53 -05:00
commit feef588420
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cave/com.raytheon.uf.viz.core.rsc/src/com/raytheon/uf/viz/core/rsc/tools/GenericToolsResourceData.java
View file

@ -48,6 +48,7 @@ import com.raytheon.viz.core.ColorUtil;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 21, 2013 1638 mschenke Renamed to better represent purpose * Mar 21, 2013 1638 mschenke Renamed to better represent purpose
* Aug 29, 2103 DR 16550 D. Friedman Fix reflection constructor args
* *
* </pre> * </pre>
* *
@ -101,7 +102,7 @@ public class GenericToolsResourceData<T extends AbstractVizResource<?, ?>>
public T construct(LoadProperties loadProperties, IDescriptor descriptor) public T construct(LoadProperties loadProperties, IDescriptor descriptor)
throws VizException { throws VizException {
try { try {
Class<?>[] ctorParams = new Class<?>[] { this.getClass(), Class<?>[] ctorParams = new Class<?>[] { GenericToolsResourceData.class,
LoadProperties.class }; LoadProperties.class };
Object[] ctorArgs = new Object[] { this, loadProperties }; Object[] ctorArgs = new Object[] { this, loadProperties };
@ -110,7 +111,7 @@ public class GenericToolsResourceData<T extends AbstractVizResource<?, ?>>
ctor = classT.getConstructor(ctorParams); ctor = classT.getConstructor(ctorParams);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
// check for ctor with additional descriptor parameter // check for ctor with additional descriptor parameter
ctorParams = new Class<?>[] { this.getClass(), ctorParams = new Class<?>[] { GenericToolsResourceData.class,
LoadProperties.class, MapDescriptor.class }; LoadProperties.class, MapDescriptor.class };
ctorArgs = new Object[] { this, loadProperties, descriptor }; ctorArgs = new Object[] { this, loadProperties, descriptor };
ctor = classT.getConstructor(ctorParams); ctor = classT.getConstructor(ctorParams);

3
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/actions/ToggleTool.java
View file

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

0
deltaScripts/13.5.2/addBufrmosDataURI.sh Normal file → Executable file
View file