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

Merge "Omaha #2918 Synchronize mosaic dataTimes." into omaha_14.4.1

Browse source 
Former-commit-id: 4be10cf1e6 [formerly d94a040f29] [formerly 4be10cf1e6 [formerly d94a040f29] [formerly a862846e15 [formerly 4abb30354ef4f6c6520ee993a66371656db0db9f]]]
Former-commit-id: a862846e15
Former-commit-id: 711661870f [formerly 1f4daca6e3]
Former-commit-id: ba546c3001
This commit is contained in:
Nate Jensen 2014-06-02 12:44:17 -05:00 • committed by Gerrit Code Review
commit cf3a5b9a53
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/RadarMosaicResource.java
View file

@ -22,6 +22,7 @@ package com.raytheon.viz.radar.rsc.mosaic;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@ -82,6 +83,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Jun 12, 2009 1937 askripsk Initial creation
* May 21, 2009 6309 garmendariz Modified path for Geotools 2.6.4
* May 01, 2014 3100 bsteffen perform time matching on data update.
* Jun 02, 2014 2918 bsteffen Make dataTimes a synchronized list.
*
*
* </pre>
@ -123,7 +125,7 @@ public class RadarMosaicResource extends
};
protected RadarMosaicResource(RadarMosaicResourceData rrd,
LoadProperties loadProps) throws VizException {
LoadProperties loadProps) {
super(rrd, loadProps);
timeUpdateJob.setSystem(true);
rrd.addChangeListener(this);
@ -133,7 +135,7 @@ public class RadarMosaicResource extends
DEFAULT_COLOR);
}
dataTimes = new ArrayList<DataTime>();
dataTimes = Collections.synchronizedList(new ArrayList<DataTime>());
// add listener for underlying resources
for (ResourcePair rp : getResourceList()) {
if (rp.getResourceData() != null) {
@ -206,7 +208,7 @@ public class RadarMosaicResource extends
private int getSeverity(ResourcePair rp) {
int maxSeverity = -1;
if (rp.getResource() == null) {
;
} else if (rp.getResource() instanceof BestResResource) {
for (ResourcePair rp1 : ((BestResResource) rp.getResource())
.getResourceList()) {
@ -236,6 +238,7 @@ public class RadarMosaicResource extends
* @seecom.raytheon.viz.core.rsc.IVizResource#paint(com.raytheon.viz.core.
* IGraphicsTarget, com.raytheon.viz.core.PixelExtent, double, float)
*/
@Override
protected void paintInternal(IGraphicsTarget target,
PaintProperties paintProps) throws VizException {
DataTime[] frameTimes = paintProps.getFramesInfo().getTimeMap()
@ -247,7 +250,7 @@ public class RadarMosaicResource extends
if (force) {
redoTimeMatching(frameTimes);
}
List<RadarRecord> recordsToMosaic = constructRecordsToMosaic(target);
List<RadarRecord> recordsToMosaic = constructRecordsToMosaic();
if (recordsToMosaic.isEmpty() == false) {
DataTime curTime = getTimeForResource(this);
synchronized (this) {
@ -270,7 +273,7 @@ public class RadarMosaicResource extends
* @throws VizException
*/
@SuppressWarnings("unchecked")
private List<RadarRecord> constructRecordsToMosaic(IGraphicsTarget target)
private List<RadarRecord> constructRecordsToMosaic()
throws VizException {
List<RadarRecord> recordsToMosaic = new ArrayList<RadarRecord>();
@ -608,8 +611,10 @@ public class RadarMosaicResource extends
if (resourceData.getBinOffset() != null) {
time = resourceData.getBinOffset().getNormalizedTime(time);
}
if (!dataTimes.contains(time)) {
dataTimes.add(time);
synchronized (dataTimes) {
if (!dataTimes.contains(time)) {
dataTimes.add(time);
}
}
if (!Arrays.equals(timeMatchingMap.get(this), descriptor
.getFramesInfo().getTimeMap().get(this))) {
@ -651,6 +656,7 @@ public class RadarMosaicResource extends
return groupName;
}
@Override
public String[] getUpperText(DataTime time) {
if (!getResourceData().getMergeUpperText()) {
return null;