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

Merge "Issue #189 clean up unneeded references to grib." into development

Browse source 
Former-commit-id: 48e33e05e7 [formerly b68a8d986f [formerly 6cb68df37fd22b45abcaee309f9f364456905191]]
Former-commit-id: b68a8d986f
Former-commit-id: 42ce93afa8
This commit is contained in:
Richard Peter 2012-11-19 17:16:08 -06:00 • committed by Gerrit Code Review
commit 95efb81458
11 changed files with 10 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.uf.viz.monitor.scan/META-INF/MANIFEST.MF
View file

@ -18,7 +18,6 @@ Require-Bundle: org.eclipse.ui,
com.raytheon.viz.core.graphing;bundle-version="1.11.5",
com.raytheon.edex.meteolib;bundle-version="1.11.5",
org.apache.commons.logging;bundle-version="1.0.4",
com.raytheon.uf.common.dataplugin.grib;bundle-version="1.11.17",
com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0",
com.raytheon.uf.viz.cwat;bundle-version="1.11.17",
com.raytheon.uf.common.dataplugin.cwat;bundle-version="1.11.17",

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

@ -24,8 +24,7 @@ Export-Package: com.raytheon.viz.skewt,
com.raytheon.viz.skewt.rsc,
com.raytheon.viz.skewt.rscdata,
com.raytheon.viz.skewt.ui
Import-Package: com.raytheon.uf.common.dataplugin.grib,
com.raytheon.uf.viz.d2d.core,
Import-Package: com.raytheon.uf.viz.d2d.core,
com.raytheon.uf.viz.d2d.core.legend,
com.raytheon.uf.viz.d2d.core.time,
com.raytheon.uf.viz.sounding,

68
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/exception/GribDecoderException.java
View file

@ -1,68 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.edex.exception;
import com.raytheon.uf.edex.core.EdexException;
/**
* GRIB decoder exception class
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* 06/14/06 garmendariz Initial check-in
*
* </pre>
*
* @author garmendariz
* @version 1.0
*/
public class GribDecoderException extends EdexException {
/**
* Default serial version id
*/
private static final long serialVersionUID = 1L;
/**
* Constructor that accepts only a string message
*
* @param aMsg The exception message
*/
public GribDecoderException(String aMsg) {
super(aMsg);
}
/**
* Constructor that accepts a message and a cause
* @param aMsg An exception message
* @param e A message
*/
public GribDecoderException(String aMsg, Exception e) {
super(aMsg, e);
}
}

1
edexOsgi/com.raytheon.uf.common.dataplugin.cwat/META-INF/MANIFEST.MF
View file

@ -15,4 +15,3 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Export-Package: com.raytheon.uf.common.dataplugin.cwat,
com.raytheon.uf.common.dataplugin.cwat.dao
Import-Package: com.raytheon.uf.common.dataplugin.grib

1
edexOsgi/com.raytheon.uf.common.dataplugin.qpf/META-INF/MANIFEST.MF
View file

@ -14,4 +14,3 @@ Require-Bundle: javax.persistence;bundle-version="1.0.0",
org.geotools;bundle-version="2.5.2",
com.raytheon.uf.common.monitor;bundle-version="1.11.5",
com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0"
Import-Package: com.raytheon.uf.common.dataplugin.grib

3
edexOsgi/com.raytheon.uf.common.dataplugin.vil/META-INF/MANIFEST.MF
View file

@ -10,8 +10,7 @@ Require-Bundle: javax.persistence;bundle-version="1.0.0",
org.apache.commons.logging;bundle-version="1.0.4",
org.geotools;bundle-version="2.5.2",
com.raytheon.uf.common.monitor;bundle-version="1.11.5"
Import-Package: com.raytheon.uf.common.dataplugin.grib,
com.raytheon.uf.common.dataplugin.radar
Import-Package: com.raytheon.uf.common.dataplugin.radar
Export-Package: com.raytheon.uf.common.dataplugin.vil,
com.raytheon.uf.common.dataplugin.vil.dao
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

11
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java
View file

@ -60,7 +60,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.vividsolutions.jts.geom.Geometry;
/**
* Base class for encapsulating grib spatial information
* Base class for encapsulating grid spatial information
*
* <pre>
*
@ -85,8 +85,7 @@ import com.vividsolutions.jts.geom.Geometry;
@XmlAccessorType(XmlAccessType.NONE)
@DynamicSerialize
public abstract class GridCoverage extends PersistableDataObject<Integer>
implements
ISpatialObject {
implements ISpatialObject {
private static final long serialVersionUID = -1355232934065074837L;
@ -248,7 +247,7 @@ public abstract class GridCoverage extends PersistableDataObject<Integer>
}
/**
* Initializes the grib coverage object. Initialization should entail
* Initializes the grid coverage object. Initialization should entail
* creation of the crs and geometry object as well as assigning the id field
*
* @throws GridCoverageException
@ -391,8 +390,8 @@ public abstract class GridCoverage extends PersistableDataObject<Integer>
if (gridGeometry == null) {
gridGeometry = MapUtil.getGridGeometry(this);
}
return gridGeometry;
return gridGeometry;
}
public void setGridGeometry(GridGeometry2D gridGeometry) {

2
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/LambertConformalGridCoverage.java
View file

@ -157,7 +157,7 @@ public class LambertConformalGridCoverage extends GridCoverage {
getLowerLeftLon(), subGrid, this.nx, this.ny,
dxMeter, dyMeter, fromLatLon, toLatLon, true);
} catch (GridCoverageException e) {
statusHandler.handle(Priority.WARN, "Grib coverage ["
statusHandler.handle(Priority.WARN, "Grid coverage ["
+ this.getName() + "] not applicable to this site");
return null;
}

2
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/MercatorGridCoverage.java
View file

@ -243,7 +243,7 @@ public class MercatorGridCoverage extends GridCoverage {
getLowerLeftLon(), subGrid, this.nx, this.ny,
dxMeter, dyMeter, fromLatLon, toLatLon, true);
} catch (GridCoverageException e) {
statusHandler.handle(Priority.WARN, "Grib coverage ["
statusHandler.handle(Priority.WARN, "Grid coverage ["
+ this.getName() + "] not applicable to this site");
return null;
}

2
edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/PolarStereoGridCoverage.java
View file

@ -144,7 +144,7 @@ public class PolarStereoGridCoverage extends GridCoverage {
getLowerLeftLon(), subGrid, this.nx, this.ny,
dxMeter, dyMeter, fromLatLon, toLatLon, false);
} catch (GridCoverageException e) {
statusHandler.handle(Priority.WARN, "Grib coverage ["
statusHandler.handle(Priority.WARN, "Grid coverage ["
+ this.getName() + "] not applicable to this site");
return null;
}

1
edexOsgi/com.raytheon.uf.common.monitor/META-INF/MANIFEST.MF
View file

@ -23,7 +23,6 @@ Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.11.5",
com.raytheon.uf.common.dataplugin.binlightning;bundle-version="1.0.0",
com.raytheon.uf.common.localization;bundle-version="1.11.17",
org.eclipse.swt,
com.raytheon.uf.common.dataplugin.grib;bundle-version="1.11.26",
com.raytheon.uf.common.sounding;bundle-version="1.12.1112",
com.raytheon.uf.common.dataplugin.bufrua;bundle-version="1.12.1112",
com.raytheon.uf.edex.pointdata;bundle-version="1.12.1112",