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

Merge "Issue #1916 overrode getDataTimes() to boost efficiency" into omaha_13.4.1

Browse source 
Former-commit-id: ec6edaaad3943caf55f97e8f7fd9974086e3b360
This commit is contained in:
Nate Jensen 2013-04-18 10:15:57 -05:00 • committed by Gerrit Code Review
commit 7562ac5edc
1 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
cave/com.raytheon.uf.viz.cwat/src/com/raytheon/uf/viz/cwat/CWATResource.java
View file

@ -21,7 +21,9 @@ package com.raytheon.uf.viz.cwat;
import java.nio.ShortBuffer; import java.nio.ShortBuffer;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map;
import org.opengis.referencing.FactoryException; import org.opengis.referencing.FactoryException;
import org.opengis.referencing.crs.CoordinateReferenceSystem; import org.opengis.referencing.crs.CoordinateReferenceSystem;
@ -68,6 +70,8 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* 16JUN2009 2037 dhladky Initial Creation. * 16JUN2009 2037 dhladky Initial Creation.
* Apr 17, 2013 1916 njensen Overrode getDataTimes()
*
* *
* </pre> * </pre>
* *
@ -78,39 +82,33 @@ import com.vividsolutions.jts.geom.Coordinate;
public class CWATResource extends public class CWATResource extends
AbstractVizResource<CWATResourceData, MapDescriptor> implements AbstractVizResource<CWATResourceData, MapDescriptor> implements
IResourceDataChanged { IResourceDataChanged {
private static final transient IUFStatusHandler statusHandler = UFStatus private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(CWATResource.class); .getHandler(CWATResource.class);
public String icao; protected CWATRecord record;
public String fieldName; private Map<DataTime, GriddedImageDisplay2> griddedDisplayMap;
public String fieldUnitString; protected DataTime displayedDataTime;
public CWATRecord record; protected DataTime previousDataTime;
private HashMap<DataTime, GriddedImageDisplay2> griddedDisplayMap;
public DataTime displayedDataTime;
public DataTime previousDataTime;
private String colormapfile = null; private String colormapfile = null;
/* The font used */ /* The font used */
public IFont font = null; protected IFont font = null;
private float cwatmax = 0.0f; private float cwatmax = 0.0f;
private float cwatmin = 0.0f; private float cwatmin = 0.0f;
boolean init = true; private boolean init = true;
public CWATResource(CWATResourceData data, LoadProperties props) { public CWATResource(CWATResourceData data, LoadProperties props) {
super(data, props); super(data, props);
data.addChangeListener(this); data.addChangeListener(this);
this.dataTimes = new ArrayList<DataTime>();
griddedDisplayMap = new HashMap<DataTime, GriddedImageDisplay2>(); griddedDisplayMap = new HashMap<DataTime, GriddedImageDisplay2>();
} }
@ -146,7 +144,10 @@ public class CWATResource extends
for (PluginDataObject pdo : pdos) { for (PluginDataObject pdo : pdos) {
try { try {
CWATRecord cwat = (CWATRecord) pdo; CWATRecord cwat = (CWATRecord) pdo;
resourceData.dataObjectMap.put(cwat.getDataTime(), cwat); synchronized (resourceData.dataObjectMap) {
resourceData.dataObjectMap
.put(cwat.getDataTime(), cwat);
}
record = cwat; record = cwat;
} catch (Exception e) { } catch (Exception e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM,
@ -303,7 +304,9 @@ public class CWATResource extends
@Override @Override
public void remove(DataTime dataTime) { public void remove(DataTime dataTime) {
this.dataTimes.remove(dataTime); synchronized (resourceData.dataObjectMap) {
resourceData.dataObjectMap.remove(dataTime);
}
GriddedImageDisplay2 display = this.griddedDisplayMap.remove(dataTime); GriddedImageDisplay2 display = this.griddedDisplayMap.remove(dataTime);
if (display != null) { if (display != null) {
display.dispose(); display.dispose();
@ -322,4 +325,14 @@ public class CWATResource extends
match.setParameterName(paramList); match.setParameterName(paramList);
return match; return match;
} }
@Override
public DataTime[] getDataTimes() {
DataTime[] times = new DataTime[0];
synchronized (resourceData.dataObjectMap) {
times = this.resourceData.dataObjectMap.keySet().toArray(times);
}
Arrays.sort(times);
return times;
}
} }