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

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

Browse source 
Former-commit-id: 42a05fc36d0ba3036a7e056d8871f684abf986c9
This commit is contained in:
Bryan Kowal 2013-01-17 09:59:11 -06:00
parent 68491bee01
commit a2f745ec54
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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); derivedRequest = new DerivedParameterRequest(derivedRequest);
for (Object param : derivedRequest.getBaseParams()) { for (Object param : derivedRequest.getBaseParams()) {
records.add((SatelliteRecord) param); records.add((SatelliteRecord) param);
hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param) hdf5Files.add(HDF5Util.findHDF5Location((SatelliteRecord) param));
.getAbsoluteFile());
datasets.add(getDataset(((SatelliteRecord) param).getDataURI(), datasets.add(getDataset(((SatelliteRecord) param).getDataURI(),
dataset)); 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, public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
AbstractTileSet sharedGeometryTileset) throws VizException { AbstractTileSet sharedGeometryTileset) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, sharedGeometryTileset); .getDataURI(), dataset, sharedGeometryTileset);
this.pdo = pdo; this.pdo = pdo;
} }
@ -91,7 +91,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
public SatFileBasedTileSet(PluginDataObject pdo, String dataset, public SatFileBasedTileSet(PluginDataObject pdo, String dataset,
int levels, int tileSize, GridGeometry2D gridGeometry, int levels, int tileSize, GridGeometry2D gridGeometry,
AbstractVizResource<?, ?> rsc, String viewType) throws VizException { AbstractVizResource<?, ?> rsc, String viewType) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, levels, tileSize, gridGeometry, rsc, .getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
viewType); viewType);
this.pdo = pdo; this.pdo = pdo;
@ -101,7 +101,7 @@ public class SatFileBasedTileSet extends FileBasedTileSet {
int levels, int tileSize, GridGeometry2D gridGeometry, int levels, int tileSize, GridGeometry2D gridGeometry,
AbstractVizResource<?, ?> rsc, PixelInCell pixelOrientation, AbstractVizResource<?, ?> rsc, PixelInCell pixelOrientation,
String viewType) throws VizException { String viewType) throws VizException {
super(HDF5Util.findHDF5Location(pdo).getAbsolutePath(), pdo super(HDF5Util.findHDF5Location(pdo).getPath(), pdo
.getDataURI(), dataset, levels, tileSize, gridGeometry, rsc, .getDataURI(), dataset, levels, tileSize, gridGeometry, rsc,
pixelOrientation, viewType); pixelOrientation, viewType);
this.pdo = pdo; 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... // Given the NcscatRecord, locate the associated HDF5 data...
File location = HDF5Util.findHDF5Location(nsRecord); File location = HDF5Util.findHDF5Location(nsRecord);
String hdf5File = location.getAbsolutePath();
String group = nsRecord.getDataURI(); String group = nsRecord.getDataURI();
String dataset = "Ncscat"; String dataset = "Ncscat";
// ...and retrieve it // ...and retrieve it
IDataStore ds = DataStoreFactory.getDataStore(new File(hdf5File)); IDataStore ds = DataStoreFactory.getDataStore(location);
IDataRecord dr; IDataRecord dr;
try { try {
dr = ds.retrieve(group, dataset, Request.ALL); dr = ds.retrieve(group, dataset, Request.ALL);