13.1.2-13 baseline

Former-commit-id: b2ee20b4ec [formerly b7357f4828] [formerly 93063d4849 [formerly 20b078fc5b7953df9edd6792682d2f63c2de76b2]]
Former-commit-id: 93063d4849
Former-commit-id: 95cd4e2a01
This commit is contained in:
Steve Harris 2013-01-31 12:10:52 -05:00
parent d61eec013f
commit 827fb62d9d
3 changed files with 10 additions and 8 deletions

View file

@ -630,6 +630,15 @@ public abstract class AbstractDescriptor extends ResourceGroup implements
int idx = frameIndex;
if (frames != null) {
frames = Arrays.copyOf(frames, frames.length);
if (idx < 0 || idx >= frames.length) {
// This only happens for 4-panels with shared time managers.
idx = frames.length - 1;
}
} else {
// It should already be -1 already but this is here for
// certain 4 panels where the time manager is shared and the
// index and frames are out of sync.
idx = -1;
}
Map<AbstractVizResource<?, ?>, DataTime[]> timeMap = new HashMap<AbstractVizResource<?, ?>, DataTime[]>(
timeMatchingMap);

View file

@ -266,7 +266,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher implements
// Next try to get the closest time to
DataTime[] origSteps = currInfo.getFrameTimes();
int curIndex = currInfo.getFrameIndex();
if (origSteps != null && curIndex > 0 && curIndex < origSteps.length) {
if (origSteps != null && curIndex >= 0 && curIndex < origSteps.length) {
DataTime startTime = origSteps[curIndex];
int dateIndex = Arrays.binarySearch(timeSteps, startTime);
if (dateIndex < 0) {

View file

@ -1,7 +0,0 @@
cave/build/static/common/cave/etc/ncep/PgenXmlOverlayProducts
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tAtl
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tPac
cave/build/static/common/cave/etc/ncep/ResourceDefns/OVERLAYS/G2tTpc
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/gov.noaa.nws.ncep.edex.plugin.convsigmet
ncep/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet/gov.noaa.nws.ncep.edex.plugin.nonconvsigmet
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/util