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

Merge changes I42a05fc3,I796f9e15 into development

Browse source 
* changes:
  Issue #1469 - getPath will be used in the place of getAbsolutePath so java does not prepend a fictional path to the beginning of the expected path
  Issue #1494 - the com.raytheon.viz.dataaccess feature will now be built


Former-commit-id: b2b281af7d [formerly b2b281af7d [formerly 67476b3423f0cdc072e3e0ac2739b92cc2782690]]
Former-commit-id: 3529181da1
Former-commit-id: 5c5201ad6e
This commit is contained in:
Greg Armendariz 2013-01-17 10:19:50 -06:00 • committed by Gerrit Code Review
commit 5e71323d0d
4 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cave/build/p2-build.xml
View file

@ -304,6 +304,10 @@
<param name="feature"
value="com.raytheon.uf.viz.gisdatastore.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.dataaccess.feature" />
</antcall>
<antcall target="cleanup.features" />
</target>

3
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java
View file

@ -260,8 +260,7 @@ public class SatelliteDataCubeAdapter implements IDataCubeAdapter {
derivedRequest = new DerivedParameterRequest(derivedRequest);
for (Object param : derivedRequest.getBaseParams()) {
records.add((SatelliteRecord) param);
hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param)
.getAbsoluteFile());
hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param));
datasets.add(getDataset(((SatelliteRecord) param).getDataURI(),
dataset));
}

6
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java
View file

@ -83,7 +83,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
AbstractTileSet sharedGeometryTileset) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, sharedGeometryTileset);
this.pdo = pdo;
}
@ -91,7 +91,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
int levels, int tileSize, GridGeometry2D gridGeometry,
AbstractVizResource<?, ?> rsc, String viewType) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
viewType);
this.pdo = pdo;
@ -101,7 +101,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
int levels, int tileSize, GridGeometry2D gridGeometry,
AbstractVizResource<?, ?> rsc, PixelInCell pixelOrientation,
String viewType) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo
super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
pixelOrientation, viewType);
this.pdo = pdo;

3
ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java
View file

@ -130,12 +130,11 @@ public class NcscatResource extends
// Given the NcscatRecord, locate the associated HDF5 data...
File location = HDF5Util.findHDF5Location(nsRecord);
String hdf5File = location.getAbsolutePath();
String group = nsRecord.getDataURI();
String dataset = "Ncscat";
// ...and retrieve it
IDataStore ds = DataStoreFactory.getDataStore(new File(hdf5File));
IDataStore ds = DataStoreFactory.getDataStore(location);
IDataRecord dr;
try {
dr = ds.retrieve(group, dataset, Request.ALL);