From c302ab8123f27b724c5e88841477f745e6e4b324 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Wed, 16 Jan 2013 09:35:54 -0600 Subject: [PATCH 1/2] Issue #1494 - the com.raytheon.viz.dataaccess feature will now be built Former-commit-id: a921d13fe1363bf003c3918b95b794e44559ccee [formerly 846d860eb26c7c5b1eecdaab93a5fbbee7694b90] [formerly 68491bee01c17e70a74869341bfa79fb446ec054] [formerly a921d13fe1363bf003c3918b95b794e44559ccee [formerly 846d860eb26c7c5b1eecdaab93a5fbbee7694b90] [formerly 68491bee01c17e70a74869341bfa79fb446ec054] [formerly 08c2faaabe01dac3a529a5b0c303334d4ef97636 [formerly 68491bee01c17e70a74869341bfa79fb446ec054 [formerly 796f9e15632bf3491c68702be5e7135c51b99fec]]]] Former-commit-id: 08c2faaabe01dac3a529a5b0c303334d4ef97636 Former-commit-id: 066e7e05e3c40e99747d511d5d20134d36acbff8 [formerly ef232c483ffa72fd0cffa1fb561652776267ae35] [formerly b6540a84f2e89d1c2d86209b3c27bcd92e6dad14 [formerly 7dbe52a47a6229b10f533abc8b20d5df1fa03aad]] Former-commit-id: c12932a76bb41bffb2db28f60a634eeb202dd955 [formerly dfe8b8b29164d55e1efc14471d942eef8a13771b] Former-commit-id: 0b8e0ac9706c20424cb0995b1effa0b79ca540a3 --- cave/build/p2-build.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml index a28b6ba957..b302e1c2c4 100644 --- a/cave/build/p2-build.xml +++ b/cave/build/p2-build.xml @@ -304,6 +304,10 @@ + + + From a7f8d65804d8f68fade262694ec52b7fc3c30651 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Thu, 17 Jan 2013 09:59:11 -0600 Subject: [PATCH 2/2] 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 Former-commit-id: 9e1825b27071a4659ae784b80e85d40ea3fbbc0c [formerly 86bd4e3b3fc26aa68d0f4ae217020aebd30807eb] [formerly a2f745ec54204e68d2d65283da7ad8f6e1197782] [formerly 9e1825b27071a4659ae784b80e85d40ea3fbbc0c [formerly 86bd4e3b3fc26aa68d0f4ae217020aebd30807eb] [formerly a2f745ec54204e68d2d65283da7ad8f6e1197782] [formerly 5d769d8a8db4d1c42e5a808d5fb4f4faca495619 [formerly a2f745ec54204e68d2d65283da7ad8f6e1197782 [formerly 42a05fc36d0ba3036a7e056d8871f684abf986c9]]]] Former-commit-id: 5d769d8a8db4d1c42e5a808d5fb4f4faca495619 Former-commit-id: 9761bc18eaa0f1dd3548e5eb370da756e4bcab8d [formerly d9832e846b7108c7f4f75e9606bc98e98b57d87e] [formerly 2108d5adbe08bf12c597593f05366699193eb6b8 [formerly 2bb5377a4da476a50c4058d01e8e8c190340d999]] Former-commit-id: f94a7412d8370472fbff4f7faa55e5eb8e3ba709 [formerly 0c5323fadbd86bf2b71cc32bef2806a92b49b7e3] Former-commit-id: dc85c1692b09622fa5483325e8e2a10798c9220a --- .../raytheon/viz/satellite/SatelliteDataCubeAdapter.java | 3 +-- .../com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java | 6 +++--- .../noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java index de225c36c7..84660a393c 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/SatelliteDataCubeAdapter.java @@ -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)); } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java index 173b06ac23..546f120101 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatFileBasedTileSet.java @@ -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; diff --git a/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java b/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java index 9ca878ef37..ebdea90c43 100644 --- a/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java +++ b/ncep/gov.noaa.nws.ncep.viz.rsc.ncscat/src/gov/noaa/nws/ncep/viz/rsc/ncscat/rsc/NcscatResource.java @@ -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);