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

mute ncep imports in viz.satellite to stop this ridiculous feature group rpm install error.

Browse source 
Former-commit-id: f949ced66cab10e6b7917392474430173896998d [formerly 2dfea62b53]
Former-commit-id: 8a9f313520
This commit is contained in:
AWIPS User 2015-07-15 12:36:20 -06:00
parent 0d3bc75aa2
commit 13afdf6219
3 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.viz.satellite/META-INF/MANIFEST.MF
View file

@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8",
com.raytheon.uf.viz.core.rsc;bundle-version="1.14", com.raytheon.uf.viz.core.rsc;bundle-version="1.14",
javax.measure javax.measure
Import-Package: com.raytheon.viz.core.rsc, Import-Package: com.raytheon.viz.core.rsc,
com.raytheon.viz.core.rsc.hdf5, com.raytheon.viz.core.rsc.hdf5
gov.noaa.nws.ncep.viz.common.area
Export-Package: com.raytheon.viz.satellite, Export-Package: com.raytheon.viz.satellite,
com.raytheon.viz.satellite.rsc com.raytheon.viz.satellite.rsc

24
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
View file

@ -84,8 +84,8 @@ import com.raytheon.viz.satellite.tileset.SatDataRetriever;
import com.raytheon.viz.satellite.tileset.SatTileSetRenderable; import com.raytheon.viz.satellite.tileset.SatTileSetRenderable;
import com.vividsolutions.jts.geom.Coordinate; import com.vividsolutions.jts.geom.Coordinate;
import gov.noaa.nws.ncep.viz.common.area.AreaName.AreaSource; //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.IAreaProviderCapable;
/** /**
@ -136,7 +136,7 @@ import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable;
*/ */
public class SatResource extends public class SatResource extends
AbstractPluginDataObjectResource<SatResourceData, IMapDescriptor> AbstractPluginDataObjectResource<SatResourceData, IMapDescriptor>
implements ImageProvider, Interrogatable, IAreaProviderCapable { implements ImageProvider, Interrogatable {
protected SatResourceData satRscData; protected SatResourceData satRscData;
/** /**
@ -656,14 +656,14 @@ public class SatResource extends
return result; return result;
} }
@Override // @Override
public AreaSource getSourceProvider() { // public AreaSource getSourceProvider() {
return satRscData.getSourceProvider(); // return satRscData.getSourceProvider();
} // }
//
@Override // @Override
public String getAreaName() { // public String getAreaName() {
return satRscData.getAreaName(); // return satRscData.getAreaName();
} // }
} }

23
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResourceData.java
View file

@ -19,8 +19,8 @@
**/ **/
package com.raytheon.viz.satellite.rsc; package com.raytheon.viz.satellite.rsc;
import gov.noaa.nws.ncep.viz.common.area.IAreaProviderCapable; //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.AreaName.AreaSource;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -73,8 +73,7 @@ import com.raytheon.viz.satellite.inventory.SatelliteDataCubeAdapter;
*/ */
@XmlAccessorType(XmlAccessType.NONE) @XmlAccessorType(XmlAccessType.NONE)
public class SatResourceData extends AbstractRequestableResourceData public class SatResourceData extends AbstractRequestableResourceData{
implements IAreaProviderCapable{
private static final transient IUFStatusHandler statusHandler = UFStatus private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(SatResourceData.class); .getHandler(SatResourceData.class);
@ -210,13 +209,13 @@ public class SatResourceData extends AbstractRequestableResourceData
} }
public AreaSource getSourceProvider() { // public AreaSource getSourceProvider() {
return AreaSource.getAreaSource("GINI_SECTOR_ID"); // return .getAreaSource("GINI_SECTOR_ID");
} // }
//
public String getAreaName() { // public String getAreaName() {
//return metadataMap.get("creatingEntity").getConstraintValue()+"/"+metadataMap.get("sectorID").getConstraintValue(); // //return metadataMap.get("creatingEntity").getConstraintValue()+"/"+metadataMap.get("sectorID").getConstraintValue();
return "SAT/"+metadataMap.get("sectorID").getConstraintValue(); // return "SAT/"+metadataMap.get("sectorID").getConstraintValue();
} // }
} }