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

Merge "Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor" into development

Browse source 
Former-commit-id: 60f15e1081 [formerly 12a9907775] [formerly 08a90aa293 [formerly ae5a73adff9925796610ccdda83459a2f7ffb771]]
Former-commit-id: 08a90aa293
Former-commit-id: 41fb919028
This commit is contained in:
Nate Jensen 2013-07-17 17:10:32 -05:00 • committed by Gerrit Code Review
commit a0bccec268
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
View file

@ -104,7 +104,6 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
/** The number of frames time matched against */
private int lastFrameCount;
public DataTime[] getLastBaseTimes() {
return lastBaseTimes;
}
@ -195,6 +194,32 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
}
}
/**
* Checks if a resource is contained in the {@link IResourceGroup}
* recursively checking for {@link IResourceGroup}s in the group's list
*
* @param group
* @param resource
* @return
*/
private boolean contained(IResourceGroup group,
AbstractVizResource<?, ?> resource) {
ResourceList list = group.getResourceList();
if (list.containsRsc(resource)) {
return true;
} else {
for (ResourcePair rp : list) {
if (rp.getResourceData() instanceof IResourceGroup) {
if (contained((IResourceGroup) rp.getResourceData(),
resource)) {
return true;
}
}
}
}
return false;
}
/*
* (non-Javadoc)
*
@ -205,8 +230,13 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
synchronized (this) {
if (timeMatchBasis != null) {
IDescriptor tmDescriptor = timeMatchBasis.getDescriptor();
if (tmDescriptor != null && tmDescriptor != descriptor) {
redoTimeMatching(timeMatchBasis.getDescriptor());
if (tmDescriptor != null) {
if (tmDescriptor != descriptor) {
redoTimeMatching(tmDescriptor);
} else if (contained(tmDescriptor, timeMatchBasis) == false) {
// Checks to ensure the timeMatchBasis is not "orphaned"
timeMatchBasis = null;
}
}
}
FramesInfo currInfo = descriptor.getFramesInfo();
@ -499,7 +529,7 @@ public class D2DTimeMatcher extends AbstractTimeMatcher {
DataTime[] times = makeEmptyLoadList(numberOfFrames, rsc);
if (times != null) {
TimeCache cache = getTimeCache(rsc);
synchronized(cache){
synchronized (cache) {
cache.setTimes(null, times, numberOfFrames);
}
return times;