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

Issue #189 changes from code review

Browse source 
Former-commit-id: 25731091d2 [formerly 3c222ab437] [formerly 984d128d33] [formerly 7139c80557 [formerly 984d128d33 [formerly 449762acbbe74173121e19f5c325104221c083a2]]]
Former-commit-id: 7139c80557
Former-commit-id: ed268afbee011a325fcb6afd97574d59f6b6cb4c [formerly b0bf62ce6f]
Former-commit-id: fcc23a917e
This commit is contained in:
Ben Steffensmeier 2012-10-25 16:33:59 -05:00
parent a02048de74
commit d3fe2e8c91
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/VizGroupResource.java
View file

@ -97,7 +97,8 @@ public class VizGroupResource extends
PaintProperties paintProps) throws VizException {
for (ResourcePair rp : this.resourceData.resourceList) {
if (rp.getResource() != null) {
paintProps.setDataTime(descriptor.getTimeForResource(rp.getResource()));
paintProps.setDataTime(descriptor.getTimeForResource(rp
.getResource()));
rp.getResource().paint(target, paintProps);
}
}
@ -116,9 +117,9 @@ public class VizGroupResource extends
String value = "No Data";
for (ResourcePair pair : rl) {
if (pair.getResource() != null) {
AbstractVizResource<?,?> rsc = pair.getResource();
AbstractVizResource<?, ?> rsc = pair.getResource();
value = rsc.inspect(coord);
if (value.equalsIgnoreCase(NO_DATA) == false) {
if (NO_DATA.equalsIgnoreCase(value) == false) {
return value;
}
}
@ -156,16 +157,17 @@ public class VizGroupResource extends
resource.registerListener(this);
}
}
// this.dataTimes = new ArrayList<DataTime>(resourceData.getMap().keySet());
// this.dataTimes = new
// ArrayList<DataTime>(resourceData.getMap().keySet());
// If child resources have capabilities that this does not, steal them
for (AbstractVizResource<?, ?> rcs : getResourceData().getRscs()) {
for (AbstractCapability capability : rcs.getCapabilities()
.getCapabilityClassCollection()) {
// if (!hasCapability(capability.getClass())) {
// if (!hasCapability(capability.getClass())) {
this.getCapabilities().addCapability(capability);
capability.setResourceData(resourceData);
// }
// }
}
}
// Spread my master capability set to all my children

5
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/GridResourceData.java
View file

@ -138,8 +138,9 @@ public class GridResourceData extends AbstractRequestableResourceData implements
records[i] = (GridRecord) objects[i];
} else {
throw new IllegalArgumentException(
"GridResourceData only supports data stored in grid format, not "
+ objects[i].getPluginName() + " data");
"GridResourceData only supports data for the grid plugin, the "
+ objects[i].getPluginName()
+ " plugin is not supported.");
}
}
sampling = sampling == null ? false : sampling;