diff --git a/cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF index 63c1b39a20..b3982026d6 100644 --- a/cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF +++ b/cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF @@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8", com.raytheon.uf.viz.core.rsc;bundle-version="1.14", javax.measure Import-Package: com.raytheon.viz.core.rsc, - com.raytheon.viz.core.rsc.hdf5, - gov.noaa.nws.ncep.viz.common.area + com.raytheon.viz.core.rsc.hdf5 Export-Package: com.raytheon.viz.satellite, com.raytheon.viz.satellite.rsc diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java index 0cea97e475..b535834693 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java @@ -84,8 +84,8 @@ import com.raytheon.viz.satellite.tileset.SatDataRetriever; import com.raytheon.viz.satellite.tileset.SatTileSetRenderable; import com.vividsolutions.jts.geom.Coordinate; -import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; -import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; +//import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; +//import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; /** @@ -136,7 +136,7 @@ import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; */ public class SatResource extends AbstractPluginDataObjectResource - implements ImageProvider, Interrogatable, IAreaProviderCapable { + implements ImageProvider, Interrogatable { protected SatResourceData satRscData; /** @@ -656,14 +656,14 @@ public class SatResource extends return result; } - @Override - public AreaSource getSourceProvider() { - return satRscData.getSourceProvider(); - } - - @Override - public String getAreaName() { - return satRscData.getAreaName(); - } +// @Override +// public AreaSource getSourceProvider() { +// return satRscData.getSourceProvider(); +// } +// +// @Override +// public String getAreaName() { +// return satRscData.getAreaName(); +// } } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java index eb817640ef..2b93014e0e 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java @@ -19,8 +19,8 @@ **/ package com.raytheon.viz.satellite.rsc; -import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; -import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; +//import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; +//import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; import java.io.File; import java.util.ArrayList; @@ -73,8 +73,7 @@ import com.raytheon.viz.satellite.inventory.SatelliteDataCubeAdapter; */ @XmlAccessorType(XmlAccessType.NONE) -public class SatResourceData extends AbstractRequestableResourceData - implements IAreaProviderCapable{ +public class SatResourceData extends AbstractRequestableResourceData{ private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(SatResourceData.class); @@ -210,13 +209,13 @@ public class SatResourceData extends AbstractRequestableResourceData } - public AreaSource getSourceProvider() { - return AreaSource.getAreaSource("GINI_SECTOR_ID"); - } - - public String getAreaName() { - //return metadataMap.get("creatingEntity").getConstraintValue()+"/"+metadataMap.get("sectorID").getConstraintValue(); - return "SAT/"+metadataMap.get("sectorID").getConstraintValue(); - } +// public AreaSource getSourceProvider() { +// return .getAreaSource("GINI_SECTOR_ID"); +// } +// +// public String getAreaName() { +// //return metadataMap.get("creatingEntity").getConstraintValue()+"/"+metadataMap.get("sectorID").getConstraintValue(); +// return "SAT/"+metadataMap.get("sectorID").getConstraintValue(); +// } }