();
-
- if (inc > 1) {
- keep.add(0);
- for (int i = (int) inc; i < totalSize && keep.size() < maxPoints; i += inc) {
- keep.add(i);
- }
- totalSize = maxPoints;
- }
- int skipped = 0;
- float[] tmpZ = new float[totalSize];
- float[] tmpX = new float[totalSize];
- float[] tmpY = new float[totalSize];
- int actualSize = 0;
- for (int i = 0; i < yData.length; ++i) {
- for (int j = 0; j < xData.length; ++j) {
- int index = i * xData.length + j;
- if ((inc <= 1 || keep.contains(index))
- && (zValues[index] > CubeUtil.MISSING)) {
- tmpX[index - skipped] = xData[j];
- tmpY[index - skipped] = yData[i];
- tmpZ[index - skipped] = zValues[index];
- ++actualSize;
- } else {
- skipped++;
- }
- }
- }
- if (actualSize == 0) {
- throw new VizDataCubeException(
- "No Valid data found for interpolation");
- }
- zValues = new float[actualSize];
- xData = new float[actualSize];
- yData = new float[actualSize];
- System.arraycopy(tmpZ, 0, zValues, 0, actualSize);
- System.arraycopy(tmpX, 0, xData, 0, actualSize);
- System.arraycopy(tmpY, 0, yData, 0, actualSize);
-
- request.setXData(xData);
- request.setYData(yData);
- request.setZData(zValues);
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/capabilities/ISliceableResource.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/capabilities/ISliceableResource.java
deleted file mode 100644
index 87e3a535b2..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/rsc/capabilities/ISliceableResource.java
+++ /dev/null
@@ -1,47 +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.uf.viz.core.rsc.capabilities;
-
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.core.slice.AbstractSlice;
-import com.raytheon.viz.core.slice.request.SliceRequest;
-
-/**
- * Interface for sliceable resources
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 29, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public interface ISliceableResource {
-
- public void slice(SliceRequest request) throws VizException;
-
- public AbstractSlice getSlice();
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/AbstractSlice.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/AbstractSlice.java
deleted file mode 100644
index 4c978defb3..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/AbstractSlice.java
+++ /dev/null
@@ -1,138 +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.viz.core.slice;
-
-import org.opengis.coverage.grid.GridGeometry;
-
-import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.interp.InterpolationResult;
-import com.raytheon.uf.viz.core.style.level.SingleLevel;
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * A slice of data
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 28, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public abstract class AbstractSlice {
-
- protected GridGeometry gridGeometry;
-
- protected DataTime[] dataTimes;
-
- protected float interpolationFactor = 1.0f;
-
- protected SingleLevel[] levels;
-
- protected InterpolationResult interpResult;
-
- protected Coordinate[] coordinates;
-
- public abstract Object getSliceData();
-
- public abstract void setSliceData(Object data);
-
- public InterpolationResult getInterpResult() {
- return interpResult;
- }
-
- public void setInterpResult(InterpolationResult interpResult) {
- this.interpResult = interpResult;
- }
-
- /**
- * @return the gridGeometry
- */
- public GridGeometry getGridGeometry() {
- return gridGeometry;
- }
-
- public void setLevels(SingleLevel[] levels) {
- this.levels = levels;
- }
-
- public SingleLevel[] getLevels() {
- return this.levels;
- }
-
- /**
- * @param gridGeometry
- * the gridGeometry to set
- */
- public void setGridGeometry(GridGeometry gridGeometry) {
- this.gridGeometry = gridGeometry;
- }
-
- /**
- * @return the dataTime
- */
- public DataTime[] getDataTime() {
- return dataTimes;
- }
-
- /**
- * @param dataTime
- * the dataTime to set
- */
- public void setDataTime(DataTime[] dataTimes) {
- this.dataTimes = dataTimes;
- }
-
- /**
- * @return the interpolationFactor
- */
- public float getInterpolationFactor() {
- return interpolationFactor;
- }
-
- /**
- * @param interpolationFactor
- * the interpolationFactor to set
- */
- public void setInterpolationFactor(float interpolationFactor) {
- this.interpolationFactor = interpolationFactor;
- }
-
- /**
- * @return the coordinates
- */
- public Coordinate[] getCoordinates() {
- return coordinates;
- }
-
- /**
- * @param coordinates
- * the coordinates to set
- */
- public void setCoordinates(Coordinate[] coordinates) {
- this.coordinates = coordinates;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/FloatSlice.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/FloatSlice.java
deleted file mode 100644
index 9f1ea9be95..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/FloatSlice.java
+++ /dev/null
@@ -1,56 +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.viz.core.slice;
-
-/**
- * A slice of data where the data is floats
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 28, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public class FloatSlice extends AbstractSlice {
-
- protected float[] sliceData;
-
- /**
- * @return the sliceData
- */
- public float[] getSliceData() {
- return sliceData;
- }
-
- /**
- * @param sliceData
- * the sliceData to set
- */
- public void setSliceData(Object sliceData) {
- this.sliceData = (float[]) sliceData;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/ISliceable.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/ISliceable.java
deleted file mode 100644
index 3de6fb1a50..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/ISliceable.java
+++ /dev/null
@@ -1,52 +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.viz.core.slice;
-
-import com.raytheon.uf.viz.core.exception.VizException;
-import com.raytheon.viz.core.slice.request.SliceRequest;
-
-/**
- * Interface for sliceable data
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 28, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public interface ISliceable {
-
- /**
- * Slices data, returning an AbstractSlice for each time requested
- *
- * @param aRequest
- * the slice request
- * @return a slice for each time
- * @throws VizException
- */
- public AbstractSlice[] slice(SliceRequest aRequest) throws VizException;
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/SliceRequest.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/SliceRequest.java
deleted file mode 100644
index 05bad294c8..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/SliceRequest.java
+++ /dev/null
@@ -1,69 +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.viz.core.slice.request;
-
-import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.viz.core.interp.InterpolationRequest;
-
-/**
- * A request to slice data
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 28, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public abstract class SliceRequest {
-
- protected DataTime[] times;
-
- protected InterpolationRequest request;
-
- /**
- * @return the times
- */
- public DataTime[] getTimes() {
- return times;
- }
-
- /**
- * @param times
- * the times to set
- */
- public void setTimes(DataTime[] times) {
- this.times = times;
- }
-
- public InterpolationRequest getRequest() {
- return request;
- }
-
- public void setRequest(InterpolationRequest request) {
- this.request = request;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPlaneRequest.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPlaneRequest.java
deleted file mode 100644
index 9878420bc9..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPlaneRequest.java
+++ /dev/null
@@ -1,60 +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.viz.core.slice.request;
-
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * Slice request for a vertical plane (i.e. cross section). The results returned
- * from this slice contain grids where y represents the height in the atmosphere
- * and x represents point on a line on the earth.
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Nov 28, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public class VerticalPlaneRequest extends VerticalRequest {
-
- protected Coordinate[] coordinates;
-
- /**
- * @return the startCoordinate
- */
- public Coordinate[] getCoordinates() {
- return coordinates;
- }
-
- /**
- * @param startCoordinate
- * the startCoordinate to set
- */
- public void setCoordinates(Coordinate[] coordinates) {
- this.coordinates = coordinates;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPointRequest.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPointRequest.java
deleted file mode 100644
index f80a8fad56..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalPointRequest.java
+++ /dev/null
@@ -1,81 +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.viz.core.slice.request;
-
-import com.vividsolutions.jts.geom.Coordinate;
-
-/**
- * Slice request for data at a single point at multiple heights and times.
- * Slices returned from this contain grids where y represents the height in the
- * atmosphere and x represents successive data times.
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Dec 11, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public class VerticalPointRequest extends VerticalRequest {
-
- public enum TimeDirection {
- RIGHT_TO_LEFT, LEFT_TO_RIGHT
- };
-
- protected Coordinate coordinate;
-
- protected TimeDirection timeDirection = TimeDirection.LEFT_TO_RIGHT;
-
- /**
- * @return the coordinate
- */
- public Coordinate getCoordinate() {
- return coordinate;
- }
-
- /**
- * @param coordinate
- * the coordinate to set
- */
- public void setCoordinate(Coordinate coordinate) {
- this.coordinate = coordinate;
- }
-
- /**
- * @return the timeDirection
- */
- public TimeDirection getTimeDirection() {
- return timeDirection;
- }
-
- /**
- * @param timeDirection
- * the timeDirection to set
- */
- public void setTimeDirection(TimeDirection timeDirection) {
- this.timeDirection = timeDirection;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalRequest.java b/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalRequest.java
deleted file mode 100644
index b2572ca7f5..0000000000
--- a/cave/com.raytheon.uf.viz.core/src/com/raytheon/viz/core/slice/request/VerticalRequest.java
+++ /dev/null
@@ -1,76 +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.viz.core.slice.request;
-
-import com.raytheon.uf.viz.core.style.level.SingleLevel;
-import com.raytheon.viz.core.slice.request.HeightScale.ScaleType;
-
-/**
- * Slice request for vertical representation of data
- *
- *
- * SOFTWARE HISTORY
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Dec 11, 2007 njensen Initial creation
- *
- *
- *
- * @author njensen
- * @version 1.0
- */
-
-public abstract class VerticalRequest extends SliceRequest {
-
- protected SingleLevel[] levels;
-
- protected ScaleType scale;
-
- /**
- * @return the levels
- */
- public SingleLevel[] getLevels() {
- return levels;
- }
-
- /**
- * @param levels
- * the levels to set
- */
- public void setLevels(SingleLevel[] levels) {
- this.levels = levels;
- }
-
- /**
- * @return the scale
- */
- public ScaleType getScale() {
- return scale;
- }
-
- /**
- * @param scale
- * the scale to set
- */
- public void setScale(ScaleType scale) {
- this.scale = scale;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.nwsauth.feature/feature.xml b/cave/com.raytheon.uf.viz.nwsauth.feature/feature.xml
index 528e4fd55b..47f47c92a5 100644
--- a/cave/com.raytheon.uf.viz.nwsauth.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.nwsauth.feature/feature.xml
@@ -16,10 +16,10 @@
[Enter License Description here.]
-
+
-
-
+
+
-
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightDescriptor.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightDescriptor.java
index b81a6685be..cf0c709ebd 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightDescriptor.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightDescriptor.java
@@ -34,7 +34,6 @@ import com.raytheon.uf.viz.xy.map.rsc.IGraphableResource;
import com.raytheon.uf.viz.xy.timeheight.graph.TimeHeightGraph;
import com.raytheon.uf.viz.xy.timeheight.rsc.AbstractTimeHeightResource;
import com.raytheon.viz.core.slice.request.HeightScale;
-import com.raytheon.viz.core.slice.request.VerticalPointRequest.TimeDirection;
/**
* TODO Add Description
@@ -57,6 +56,10 @@ public class TimeHeightDescriptor extends XyGraphDescriptor {
public static final int REAL_FRAME_COUNT_TO_USE_WHEN_FRAME_COUNT_IS_ONE = 999;
+ public static enum TimeDirection {
+ RIGHT_TO_LEFT, LEFT_TO_RIGHT;
+ }
+
@XmlAttribute
public TimeDirection timeDirection;
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightRenderableDisplay.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightRenderableDisplay.java
index 3ec7ccaa0f..ca32ffa997 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightRenderableDisplay.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/display/TimeHeightRenderableDisplay.java
@@ -39,10 +39,10 @@ import com.raytheon.uf.viz.d2d.ui.AbstractHeightDisplay;
import com.raytheon.uf.viz.xy.map.rsc.GraphResource;
import com.raytheon.uf.viz.xy.map.rsc.GraphResourceData;
import com.raytheon.uf.viz.xy.map.rsc.GraphResourceData.OverlayMode;
+import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor.TimeDirection;
import com.raytheon.viz.core.imagery.ImageCombiner;
import com.raytheon.viz.core.slice.request.HeightScale;
import com.raytheon.viz.core.slice.request.HeightScales;
-import com.raytheon.viz.core.slice.request.VerticalPointRequest;
/**
* TODO Add Description
@@ -63,6 +63,7 @@ import com.raytheon.viz.core.slice.request.VerticalPointRequest;
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement
public class TimeHeightRenderableDisplay extends AbstractHeightDisplay {
+
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(TimeHeightRenderableDisplay.class);
@@ -106,8 +107,8 @@ public class TimeHeightRenderableDisplay extends AbstractHeightDisplay {
getDescriptor().setHeightScale(scale);
}
- public void setTimeDirection(VerticalPointRequest.TimeDirection direction) {
- ((TimeHeightDescriptor) getDescriptor()).setTimeDirection(direction);
+ public void setTimeDirection(TimeDirection direction) {
+ getDescriptor().setTimeDirection(direction);
}
@Override
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
index ee2bca025d..8f2f5fd003 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/graph/TimeHeightGraph.java
@@ -37,10 +37,10 @@ import com.raytheon.uf.viz.xy.graph.axis.LogarithmicAxisPlacer;
import com.raytheon.uf.viz.xy.graph.labeling.IGraphLabel;
import com.raytheon.uf.viz.xy.map.rsc.IGraphableResource;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
+import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor.TimeDirection;
import com.raytheon.uf.viz.xy.timeheight.rsc.AbstractTimeHeightResource;
import com.raytheon.viz.core.slice.request.HeightScale;
import com.raytheon.viz.core.slice.request.HeightScale.ScaleType;
-import com.raytheon.viz.core.slice.request.VerticalPointRequest.TimeDirection;
import com.vividsolutions.jts.geom.Coordinate;
/**
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/AbstractTimeHeightResource.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/AbstractTimeHeightResource.java
index b8cb40b58f..d6f3d18893 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/AbstractTimeHeightResource.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/AbstractTimeHeightResource.java
@@ -60,6 +60,7 @@ import com.raytheon.uf.viz.xy.map.rsc.IGraphableResource;
import com.raytheon.uf.viz.xy.map.rsc.IInsetMapResource;
import com.raytheon.uf.viz.xy.map.rsc.PointRenderable;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
+import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor.TimeDirection;
import com.raytheon.uf.viz.xy.varheight.adapter.AbstractVarHeightAdapter;
import com.raytheon.viz.core.graphing.util.GraphPrefsFactory;
import com.raytheon.viz.core.graphing.xy.XYData;
@@ -67,7 +68,6 @@ import com.raytheon.viz.core.map.GeoUtil;
import com.raytheon.viz.core.rsc.ICombinedResourceData;
import com.raytheon.viz.core.rsc.ICombinedResourceData.CombineOperation;
import com.raytheon.viz.core.slice.request.HeightScale;
-import com.raytheon.viz.core.slice.request.VerticalPointRequest.TimeDirection;
import com.vividsolutions.jts.geom.Geometry;
/**
diff --git a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightVectorResource.java b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightVectorResource.java
index 385378b4f9..6aff7b8e20 100644
--- a/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightVectorResource.java
+++ b/cave/com.raytheon.uf.viz.xy.timeheight/src/com/raytheon/uf/viz/xy/timeheight/rsc/TimeHeightVectorResource.java
@@ -51,11 +51,11 @@ import com.raytheon.uf.viz.core.style.VizStyleException;
import com.raytheon.uf.viz.xy.InterpUtils;
import com.raytheon.uf.viz.xy.graph.IGraph;
import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor;
+import com.raytheon.uf.viz.xy.timeheight.display.TimeHeightDescriptor.TimeDirection;
import com.raytheon.uf.viz.xy.varheight.adapter.AbstractVarHeightAdapter;
import com.raytheon.viz.core.contours.util.VectorGraphicsRenderable;
import com.raytheon.viz.core.graphing.xy.XYData;
import com.raytheon.viz.core.graphing.xy.XYWindImageData;
-import com.raytheon.viz.core.slice.request.VerticalPointRequest.TimeDirection;
import com.raytheon.viz.core.style.arrow.ArrowPreferences;
import com.vividsolutions.jts.geom.Coordinate;
diff --git a/cave/com.raytheon.viz.radar/META-INF/MANIFEST.MF b/cave/com.raytheon.viz.radar/META-INF/MANIFEST.MF
index 847c99ba99..de6c909cce 100644
--- a/cave/com.raytheon.viz.radar/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.viz.radar/META-INF/MANIFEST.MF
@@ -5,119 +5,48 @@ Bundle-SymbolicName: com.raytheon.viz.radar;singleton:=true
Bundle-Version: 1.12.1174.qualifier
Bundle-Activator: com.raytheon.viz.radar.Activator
Bundle-Vendor: Raytheon
-Eclipse-RegisterBuddy: com.raytheon.viz.core, com.raytheon.uf.viz.core, com.raytheon.uf.viz.ui.menus
-Require-Bundle: org.apache.batik;bundle-version="1.6.0",
- org.eclipse.ui,
- org.eclipse.core.runtime,
- com.raytheon.viz.core,
- com.raytheon.uf.viz.core,
- org.geotools,
- com.raytheon.viz.ui,
- javax.measure,
- com.raytheon.viz.pointdata;bundle-version="1.10.13",
- com.raytheon.uf.viz.d2d.ui;bundle-version="1.0.0",
- com.raytheon.viz.core.graphing;bundle-version="1.11.1",
- com.raytheon.viz.awipstools;bundle-version="1.11.11",
- com.raytheon.uf.viz.xy,
- com.raytheon.uf.common.serialization.comm;bundle-version="1.11.22",
- com.raytheon.uf.viz.productbrowser;bundle-version="1.11.31",
- com.raytheon.uf.viz.d2d.core;bundle-version="1.12.1130",
- com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0",
- com.raytheon.uf.common.menus;bundle-version="1.12.1174",
- com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
- com.raytheon.uf.viz.points;bundle-version="1.0.0",
- com.raytheon.uf.common.units;bundle-version="1.0.0",
- com.raytheon.uf.common.colormap;bundle-version="1.12.1174"
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, com.raytheon.uf.viz.core
Bundle-ActivationPolicy: lazy
-Import-Package: com.raytheon.edex.meteoLib,
- com.raytheon.uf.common.dataplugin.level,
- com.raytheon.uf.common.derivparam.tree,
- com.raytheon.uf.common.message.response,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.topo,
- com.raytheon.uf.viz.derivparam,
- com.raytheon.uf.viz.derivparam.data,
- com.raytheon.uf.viz.derivparam.inv,
- com.raytheon.uf.viz.derivparam.library,
- com.raytheon.uf.viz.derivparam.tree,
- com.raytheon.viz.core.contours.util
-Export-Package: com.raytheon.viz.radar;
- uses:="com.raytheon.viz.core.rsc,
- com.raytheon.uf.viz.core.rsc,
- com.raytheon.uf.viz.core.data,
- com.raytheon.uf.viz.core.data.resp,
- com.raytheon.edex.util.radar,
- com.raytheon.uf.viz.core,
- com.raytheon.uf.viz.core.drawables,
- com.raytheon.uf.viz.core.map,
- com.raytheon.uf.common.dataplugin.radar.level3,
- com.raytheon.viz.awipstools.common,
- org.geotools.coverage.grid,
- org.eclipse.ui.plugin,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.geospatial,
- org.eclipse.jface.preference,
- com.raytheon.viz.core.rsc.hdf5,
- org.eclipse.swt.graphics,
- com.vividsolutions.jts.geom,
- org.osgi.framework,
- org.opengis.referencing.crs",
+Export-Package: com.raytheon.viz.radar,
com.raytheon.viz.radar.interrogators,
- com.raytheon.viz.radar.rsc;
- uses:="com.raytheon.viz.awipstools.capabilityInterfaces,
- com.raytheon.viz.core.rsc,
- com.raytheon.uf.viz.core.map,
- com.raytheon.uf.viz.core.rsc.capabilities,
- com.raytheon.uf.viz.core.rsc,
- com.raytheon.viz.radar,
- com.raytheon.uf.viz.productbrowser,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.viz.core,
- com.vividsolutions.jts.geom,
- com.raytheon.uf.viz.core.drawables,
- org.opengis.referencing.crs,
- com.raytheon.uf.common.time",
+ com.raytheon.viz.radar.rsc,
com.raytheon.viz.radar.rsc.graphic,
com.raytheon.viz.radar.rsc.image,
com.raytheon.viz.radar.rsc.mosaic,
- com.raytheon.viz.radar.ui;
- uses:="com.raytheon.viz.radar,
- com.raytheon.viz.ui.dialogs,
- org.eclipse.core.commands,
- org.eclipse.swt.widgets,
- com.raytheon.uf.viz.core.procedures",
- com.raytheon.viz.radar.ui.xy;
- uses:="com.raytheon.uf.viz.core.rsc,
- com.raytheon.viz.core.graphing.axis,
- com.raytheon.viz.ui.editor,
- com.raytheon.viz.radar.rsc,
- com.raytheon.uf.viz.core,
- com.raytheon.uf.viz.xy,
- com.raytheon.uf.viz.core.drawables,
- com.raytheon.uf.common.time,
- com.raytheon.uf.viz.core.map,
- com.raytheon.viz.core.graphing.rsc,
- com.raytheon.uf.viz.xy.map.rsc,
- com.raytheon.viz.core.slice.request,
- com.raytheon.viz.core.graphing,
- com.raytheon.uf.common.dataplugin,
- org.eclipse.swt.layout,
- com.raytheon.uf.viz.d2d.ui,
- com.raytheon.viz.core.style.graph,
- org.eclipse.swt.graphics,
- com.vividsolutions.jts.geom,
- org.eclipse.swt.widgets,
- com.raytheon.viz.ui.input,
- com.raytheon.viz.core.graphing.xy",
- com.raytheon.viz.radar.util;
- uses:="com.raytheon.viz.pointdata.util,
- com.raytheon.uf.viz.core.rsc,
- com.raytheon.uf.viz.core.alerts,
- javax.measure.converter,
- com.raytheon.viz.pointdata,
- com.raytheon.uf.viz.core.catalog,
- javax.measure.unit,
- com.raytheon.uf.viz.core.drawables,
- com.raytheon.uf.common.pointdata"
+ com.raytheon.viz.radar.ui,
+ com.raytheon.viz.radar.ui.xy,
+ com.raytheon.viz.radar.util
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
+ org.eclipse.ui;bundle-version="3.8.2",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.units;bundle-version="1.0.0",
+ com.raytheon.uf.common.colormap;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.util;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.radar;bundle-version="1.0.0";visibility:=reexport,
+ com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
+ com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.common.derivparam;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
+ com.raytheon.uf.common.topo;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.core;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.d2d.core;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.d2d.ui;bundle-version="1.12.1174",
+ com.raytheon.viz.ui;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.xy;bundle-version="1.12.1174",
+ com.raytheon.viz.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.productbrowser;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.derivparam;bundle-version="1.12.1174",
+ com.raytheon.viz.core.graphing;bundle-version="1.12.1174",
+ com.raytheon.uf.viz.points;bundle-version="1.0.0",
+ com.raytheon.uf.viz.ui.menus;bundle-version="1.12.1174",
+ com.raytheon.viz.awipstools;bundle-version="1.12.1174",
+ com.raytheon.edex.meteolib;bundle-version="1.12.1174",
+ org.apache.batik;bundle-version="1.6.0"
+Import-Package: com.raytheon.viz.core.contours.util,
+ com.raytheon.viz.core.drawables,
+ com.raytheon.viz.core.rsc,
+ com.raytheon.viz.core.rsc.jts,
+ com.raytheon.viz.core.style.image
diff --git a/cave/com.raytheon.viz.satellite.feature/feature.xml b/cave/com.raytheon.viz.satellite.feature/feature.xml
index a07218b77b..2b13b23f1b 100644
--- a/cave/com.raytheon.viz.satellite.feature/feature.xml
+++ b/cave/com.raytheon.viz.satellite.feature/feature.xml
@@ -18,10 +18,9 @@
-
+
-
-
+
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
index 020fa061a6..f25005215f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/META-INF/MANIFEST.MF
@@ -3,20 +3,28 @@ Bundle-ManifestVersion: 2
Bundle-Name: Satellite Plug-in
Bundle-SymbolicName: com.raytheon.edex.plugin.satellite
Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.edex.decodertools;bundle-version="1.0.0",
- org.apache.commons.logging,
- javax.measure,
- javax.persistence,
- com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
- com.raytheon.uf.edex.menus;bundle-version="1.0.0"
Export-Package: com.raytheon.edex.plugin.satellite,
com.raytheon.edex.plugin.satellite.dao,
com.raytheon.edex.util.satellite
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.uf.common.localization,
- com.raytheon.uf.common.awipstools,
- com.raytheon.uf.common.status,
- com.raytheon.uf.edex.awipstools
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.satellite;bundle-version="1.0.0",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
+ com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
+ com.raytheon.uf.common.localization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.util;bundle-version="1.12.1174",
+ com.raytheon.uf.common.awipstools;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.core;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.database;bundle-version="1.0.0",
+ com.raytheon.uf.edex.menus;bundle-version="1.0.0",
+ org.springframework;bundle-version="3.1.4",
+ javax.persistence;bundle-version="1.0.0",
+ org.hibernate;bundle-version="1.0.0"
+Import-Package: com.raytheon.edex.exception,
+ org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
index 55827a56ef..37f242acc5 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
@@ -28,12 +28,10 @@ import java.nio.ByteBuffer;
import java.util.Calendar;
import java.util.TimeZone;
import java.util.regex.Matcher;
-import java.util.regex.Pattern;
import java.util.zip.DataFormatException;
import java.util.zip.Inflater;
import com.raytheon.edex.exception.DecoderException;
-import com.raytheon.edex.plugin.AbstractDecoder;
import com.raytheon.edex.plugin.satellite.dao.SatelliteDao;
import com.raytheon.edex.util.satellite.SatSpatialFactory;
import com.raytheon.edex.util.satellite.SatellitePosition;
@@ -44,13 +42,14 @@ import com.raytheon.uf.common.dataplugin.satellite.SatelliteMessageData;
import com.raytheon.uf.common.dataplugin.satellite.SatelliteRecord;
import com.raytheon.uf.common.datastorage.records.IDataRecord;
import com.raytheon.uf.common.status.IPerformanceStatusHandler;
+import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.PerformanceStatus;
+import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.time.DataTime;
-import com.raytheon.uf.common.util.ArraysUtil;
import com.raytheon.uf.common.time.util.ITimer;
import com.raytheon.uf.common.time.util.TimeUtil;
-import com.raytheon.uf.edex.decodertools.time.TimeTools;
-import com.raytheon.uf.edex.wmo.message.WMOHeader;
+import com.raytheon.uf.common.util.ArraysUtil;
+import com.raytheon.uf.common.util.header.WMOHeaderFinder;
/**
* Decoder implementation for satellite plugin.
@@ -79,7 +78,7 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* 01/03/2013 15294 D. Friedman Start with File instead of byte[] to
* reduce memory usage.
* Feb 15, 2013 1638 mschenke Moved array based utilities from Util into ArraysUtil
- *
+ *
* Mar 19, 2013 1785 bgonzale Added performance status handler and added status
* to decode.
*
@@ -88,7 +87,9 @@ import com.raytheon.uf.edex.wmo.message.WMOHeader;
* @author bphillip
* @version 1
*/
-public class SatelliteDecoder extends AbstractDecoder {
+public class SatelliteDecoder {
+
+ private IUFStatusHandler statusHandler = UFStatus.getHandler(getClass());
private String traceId = "";
@@ -125,11 +126,12 @@ public class SatelliteDecoder extends AbstractDecoder {
try {
removeWmoHeader(byteBuffer);
} catch (DecoderException e) {
- logger.error(e);
+ statusHandler.error("Error removing WMO header", e);
byteBuffer = null;
}
if (byteBuffer != null) {
- int offsetOfDataInFile = byteBuffer.position() + GINI_HEADER_SIZE;
+ int offsetOfDataInFile = byteBuffer.position()
+ + GINI_HEADER_SIZE;
Calendar calendar = Calendar.getInstance(TimeZone
.getTimeZone("GMT"));
int intValue = 0;
@@ -140,20 +142,23 @@ public class SatelliteDecoder extends AbstractDecoder {
record = new SatelliteRecord();
if (isCompressed(byteBuffer)) {
- /* If the data is compressed, we assume it came from the SBN
+ /*
+ * If the data is compressed, we assume it came from the SBN
* and will have a reasonable size such that we can have two
- * copies of the data in memory at the same time. Ideally,
+ * copies of the data in memory at the same time. Ideally,
* SBN decompression should be performed upstream from EDEX
* and this code would be removed.
*/
- byte[] data = new byte[(int) file.length() - byteBuffer.position()];
+ byte[] data = new byte[(int) file.length()
+ - byteBuffer.position()];
f.seek(byteBuffer.position());
f.readFully(data);
byte[][] retVal = decompressSatellite(data);
byteBuffer = ByteBuffer.wrap(retVal[0]);
tempBytes = retVal[1];
} else {
- /* The code bellow performs absolute gets on the buffer, so
+ /*
+ * The code bellow performs absolute gets on the buffer, so
* it needs to be compacted.
*/
byteBuffer.compact();
@@ -268,9 +273,10 @@ public class SatelliteDecoder extends AbstractDecoder {
SatellitePosition position = dao
.getSatellitePosition(record.getCreatingEntity());
if (position == null) {
- logger.info("Unable to determine geostationary location of ["
- + record.getCreatingEntity()
- + "]. Zeroing out fields.");
+ statusHandler
+ .info("Unable to determine geostationary location of ["
+ + record.getCreatingEntity()
+ + "]. Zeroing out fields.");
} else {
record.setSatSubPointLat(position.getLatitude());
record.setSatSubPointLon(position.getLongitude());
@@ -279,7 +285,8 @@ public class SatelliteDecoder extends AbstractDecoder {
}
if (navCalIndicator != 0) {
- logger.info("Nav/Cal info provided. Currently unused.");
+ statusHandler
+ .info("Nav/Cal info provided. Currently unused.");
}
// get number of points along x-axis
@@ -287,8 +294,9 @@ public class SatelliteDecoder extends AbstractDecoder {
// get number of points along y-axis
int ny = byteBuffer.getShort(18);
- /* If input was SBN-compressed, we already have the data
- * loaded. If not, load it now.
+ /*
+ * If input was SBN-compressed, we already have the data loaded.
+ * If not, load it now.
*/
if (tempBytes == null) {
tempBytes = new byte[nx * ny];
@@ -431,10 +439,6 @@ public class SatelliteDecoder extends AbstractDecoder {
if (record != null) {
record.setTraceId(traceId);
record.setCoverage(mapCoverage);
- record.setPersistenceTime(TimeTools.getSystemCalendar()
- .getTime());
- record.setPluginName("satellite");
- record.constructDataURI();
// Create the data record.
IDataRecord dataRec = messageData.getStorageRecord(record,
SatelliteRecord.SAT_DATASET_NAME);
@@ -466,10 +470,11 @@ public class SatelliteDecoder extends AbstractDecoder {
* @throws DecoderException
* If WMO header is not found, or is incorrect.
* @param messageData
- * Contains the start of the satellite data file. On return,
- * the position is set the beginning of the GINI header.
+ * Contains the start of the satellite data file. On return, the
+ * position is set the beginning of the GINI header.
*/
- private void removeWmoHeader(ByteBuffer messageData) throws DecoderException {
+ private void removeWmoHeader(ByteBuffer messageData)
+ throws DecoderException {
// Copy to a char [], carefully, as creating a string from
// a byte [] with binary data can create erroneous data
@@ -478,8 +483,7 @@ public class SatelliteDecoder extends AbstractDecoder {
message[i] = (char) (messageData.get() & 0xFF);
}
String msgStr = new String(message);
- Matcher matcher = null;
- matcher = Pattern.compile(WMOHeader.WMO_HEADER).matcher(msgStr);
+ Matcher matcher = WMOHeaderFinder.WMO_PATTERN.matcher(msgStr);
if (matcher.find()) {
int headerStart = matcher.start();
if (SAT_HDR_TT.equals(msgStr
@@ -500,7 +504,7 @@ public class SatelliteDecoder extends AbstractDecoder {
* Checks to see if the current satellite product is compressed.
*
* Assumes messageData is a byte[]-backed ByteBuffer.
- *
+ *
* @return A boolean indicating if the file is compressed or not
*/
private boolean isCompressed(ByteBuffer messageData) {
@@ -508,8 +512,8 @@ public class SatelliteDecoder extends AbstractDecoder {
byte[] placeholder = new byte[10];
Inflater decompressor = new Inflater();
try {
- decompressor.setInput(messageData.array(),
- messageData.position(), messageData.remaining());
+ decompressor.setInput(messageData.array(), messageData.position(),
+ messageData.remaining());
decompressor.inflate(placeholder);
} catch (DataFormatException e) {
compressed = false;
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
index 126e8a5459..a6c6f9de10 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatelliteMenuUtil.java
@@ -33,9 +33,9 @@ import com.raytheon.uf.common.geospatial.SpatialQueryFactory;
import com.raytheon.uf.common.menus.xml.CommonIncludeMenuContribution;
import com.raytheon.uf.common.menus.xml.MenuTemplateFile;
import com.raytheon.uf.common.menus.xml.VariableSubstitution;
+import com.raytheon.uf.common.serialization.comm.RequestRouter;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
-import com.raytheon.uf.edex.awipstools.GetWfoCenterHandler;
import com.raytheon.uf.edex.menus.AbstractMenuUtil;
import com.vividsolutions.jts.geom.Coordinate;
@@ -90,12 +90,13 @@ public class SatelliteMenuUtil extends AbstractMenuUtil {
Coordinate coord = null;
ISpatialQuery sp = null;
try {
- coord = new GetWfoCenterHandler().handleRequest(centerPointRequest);
+ coord = (Coordinate) RequestRouter.route(centerPointRequest);
sp = SpatialQueryFactory.create();
} catch (Exception e1) {
statusHandler.error("Unable to send request for lat/lon values");
return;
}
+
try {
lat = coord.y;
lon = coord.x;
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
index adfe4a641d..8cf6ebc48a 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/META-INF/MANIFEST.MF
@@ -3,17 +3,14 @@ Bundle-ManifestVersion: 2
Bundle-Name: Acars Plug-in
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.acars
Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.commons.logging,
+Require-Bundle: com.raytheon.uf.common.dataplugin,
com.raytheon.uf.common.pointdata,
- org.geotools,
- javax.persistence,
- javax.measure,
com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.dataplugin,
- org.hibernate;bundle-version="1.0.0"
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ javax.persistence,
+ org.hibernate;bundle-version="1.0.0",
+ javax.measure;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.dataplugin.acars
-Import-Package: com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.time
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.acars/component-deploy.xml
deleted file mode 100644
index 0dc83e8034..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.acars/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/META-INF/MANIFEST.MF
index 3c14cc690b..3d90949a16 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.acarssounding/META-INF/MANIFEST.MF
@@ -6,18 +6,16 @@ Bundle-Version: 1.12.1174.qualifier
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.commons.logging,
+Require-Bundle: com.raytheon.uf.common.serialization,
com.raytheon.uf.common.pointdata,
com.raytheon.uf.common.localization;bundle-version="1.12.1151",
- com.raytheon.uf.edex.decodertools,
- org.geotools,
+ com.raytheon.uf.common.dataplugin,
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataplugin.acars;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174",
javax.persistence,
javax.measure,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.serialization,
org.hibernate;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.dataplugin.acarssounding,
com.raytheon.uf.common.dataplugin.acarssounding.tools
-Import-Package: com.raytheon.uf.common.dataplugin.acars,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.time
+Import-Package: org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/META-INF/MANIFEST.MF
index 0ca70b2241..a0cf5e6ad6 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/META-INF/MANIFEST.MF
@@ -3,20 +3,18 @@ Bundle-ManifestVersion: 2
Bundle-Name: Bufrua Plug-in
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.bufrua
Bundle-Version: 1.12.1174.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: com.raytheon.uf.common.dataplugin.bufrua,
com.raytheon.uf.common.dataplugin.bufrua.dao
-Require-Bundle: com.raytheon.edex.common,
- org.geotools,
- org.apache.commons.logging,
+Require-Bundle: com.raytheon.uf.common.sounding;bundle-version="1.0.0",
+ com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174",
javax.persistence,
- javax.measure,
- com.raytheon.uf.common.sounding;bundle-version="1.0.0"
-Import-Package: com.raytheon.uf.common.dataplugin.bufrua,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.edex.decodertools.time,
- com.raytheon.uf.edex.decodertools.core,
- com.raytheon.uf.edex.pointdata
+ org.hibernate;bundle-version="1.0.0",
+ javax.measure
+Import-Package: org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/component-deploy.xml
deleted file mode 100644
index 638803a73c..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/META-INF/MANIFEST.MF
index 0d99a7ae3f..bc6f2ca6d3 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/META-INF/MANIFEST.MF
@@ -6,20 +6,10 @@ Bundle-Version: 1.0.0.qualifier
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.annotations,
- com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.serialization.adapters,
- com.raytheon.uf.common.serialization.annotations,
- com.raytheon.uf.common.time,
- com.vividsolutions.jts.geom,
- javax.measure.quantity,
- javax.measure.unit,
- javax.persistence
Export-Package: com.raytheon.uf.common.dataplugin.goessounding
-Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ javax.persistence;bundle-version="1.0.0",
org.hibernate;bundle-version="1.0.0"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/component-deploy.xml
deleted file mode 100644
index 2359559f38..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.goessounding/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
index 8ae556784f..ccf7a0885f 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF
@@ -6,21 +6,6 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
-Eclipse-BuddyPolicy: registered, ext, global
-Import-Package: com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.annotations,
- com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.localization,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.serialization.annotations,
- com.raytheon.uf.common.serialization.comm,
- com.raytheon.uf.common.status,
- com.raytheon.uf.common.time,
- com.vividsolutions.jts.geom,
- javax.persistence,
- org.hibernate.annotations,
- org.opengis.metadata.spatial
Export-Package: com.raytheon.uf.common.dataplugin.grid,
com.raytheon.uf.common.dataplugin.grid.dataquery,
com.raytheon.uf.common.dataplugin.grid.dataset,
@@ -29,15 +14,20 @@ Export-Package: com.raytheon.uf.common.dataplugin.grid,
com.raytheon.uf.common.dataplugin.grid.request,
com.raytheon.uf.common.dataplugin.grid.units,
com.raytheon.uf.common.dataplugin.grid.util
-Require-Bundle: javax.measure,
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.gridcoverage;bundle-version="1.0.0";visibility:=reexport,
+ com.raytheon.uf.common.parameter;bundle-version="1.0.0";visibility:=reexport,
+ com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174";visibility:=reexport,
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
com.raytheon.uf.common.geospatial,
- org.geotools,
com.raytheon.uf.common.localization,
com.raytheon.uf.common.datastorage,
- com.raytheon.uf.common.gridcoverage;bundle-version="1.0.0",
- com.raytheon.uf.common.parameter;bundle-version="1.0.0",
com.raytheon.uf.common.comm;bundle-version="1.12.1174",
com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
- com.raytheon.uf.common.dataplugin.level;bundle-version="1.12.1174",
com.raytheon.uf.common.util;bundle-version="1.12.1174",
- com.raytheon.uf.common.dataaccess;bundle-version="1.0.0"
+ com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
+ com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ javax.measure,
+ javax.persistence;bundle-version="1.0.0",
+ org.hibernate;bundle-version="1.0.0"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/META-INF/MANIFEST.MF
index 5a2340f928..2295fefcff 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/META-INF/MANIFEST.MF
@@ -6,19 +6,10 @@ Bundle-Version: 1.0.0.qualifier
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.dataplugin.annotations,
- com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.pointdata,
- com.raytheon.uf.common.pointdata.spatial,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.serialization.annotations,
- com.raytheon.uf.common.time,
- com.vividsolutions.jts.geom,
- javax.measure.quantity,
- javax.measure.unit,
- javax.persistence
Export-Package: com.raytheon.uf.common.dataplugin.poessounding
-Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.pointdata;bundle-version="1.12.1174",
+ javax.persistence;bundle-version="1.0.0",
org.hibernate;bundle-version="1.0.0"
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/component-deploy.xml
deleted file mode 100644
index 02e7160b55..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.poessounding/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/META-INF/MANIFEST.MF
index e8a2a38af2..0328d6cc49 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/META-INF/MANIFEST.MF
@@ -4,18 +4,21 @@ Bundle-Name: Profiler Plug-in
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.profiler
Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Export-Package: com.raytheon.uf.common.dataplugin.profiler,
com.raytheon.uf.common.dataplugin.profiler.dao
-Require-Bundle: com.raytheon.edex.common,
- com.raytheon.uf.common.pointdata;bundle-version="1.11.8",
- com.raytheon.uf.edex.pointdata;bundle-version="1.11.8",
- org.geotools,
- org.apache.commons.logging,
- javax.persistence,
- javax.measure,
- com.raytheon.uf.common.localization;bundle-version="1.11.16"
-Import-Package: com.raytheon.uf.common.status,
- com.raytheon.uf.edex.decodertools.core,
- com.raytheon.uf.edex.decodertools.time
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.core;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.database;bundle-version="1.0.0",
+ com.raytheon.uf.edex.pointdata;bundle-version="1.12.1174",
+ com.raytheon.uf.edex.decodertools;bundle-version="1.12.1174",
+ org.springframework;bundle-version="3.1.4",
+ javax.persistence;bundle-version="1.0.0",
+ org.hibernate;bundle-version="1.0.0",
+ javax.measure;bundle-version="1.0.0"
+Import-Package: org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/component-deploy.xml
deleted file mode 100644
index 1a4bd72c79..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.profiler/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
index 23e0e94093..9f44ebdacb 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/META-INF/MANIFEST.MF
@@ -3,62 +3,27 @@ Bundle-ManifestVersion: 2
Bundle-Name: Radar
Bundle-SymbolicName: com.raytheon.uf.common.dataplugin.radar
Bundle-Version: 1.0.0.qualifier
-Eclipse-RegisterBuddy: com.raytheon.edex.common, com.raytheon.uf.common.serialization, com.raytheon.viz.core, org.geotools
-Bundle-Activator: com.raytheon.uf.common.dataplugin.radar.Activator
+Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization, org.geotools
Bundle-Vendor: RAYTHEON
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
- com.raytheon.uf.common.datastorage,
- org.geotools;bundle-version="2.6.4",
- javax.measure,
- com.raytheon.uf.common.dataplugin;bundle-version="1.12.1174",
- com.raytheon.edex.common,
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1174",
- com.raytheon.uf.common.site;bundle-version="1.12.1174",
+ com.raytheon.uf.common.localization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.datastorage;bundle-version="1.12.1174",
+ com.raytheon.uf.common.dataquery;bundle-version="1.0.0",
com.raytheon.uf.common.dataaccess;bundle-version="1.0.0",
- com.raytheon.uf.common.units;bundle-version="1.0.0"
+ com.raytheon.uf.common.units;bundle-version="1.0.0",
+ com.raytheon.uf.common.util;bundle-version="1.12.1174",
+ javax.persistence;bundle-version="1.0.0",
+ org.hibernate;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
-Export-Package: com.raytheon.uf.common.dataplugin.radar;
- uses:="com.raytheon.uf.common.dataplugin.persist,
- com.raytheon.uf.common.dataplugin.radar.level3,
- com.raytheon.uf.common.dataplugin,
- com.raytheon.uf.common.geospatial,
- javax.measure.unit,
- org.osgi.framework,
- com.vividsolutions.jts.geom,
- com.raytheon.uf.common.dataplugin.radar.util,
- org.opengis.referencing.crs,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.time",
- com.raytheon.uf.common.dataplugin.radar.level3;uses:="com.raytheon.uf.common.dataplugin.radar.level3.generic,com.raytheon.uf.common.serialization",
- com.raytheon.uf.common.dataplugin.radar.level3.generic;uses:="com.raytheon.uf.common.serialization",
+Export-Package: com.raytheon.uf.common.dataplugin.radar,
+ com.raytheon.uf.common.dataplugin.radar.level3,
+ com.raytheon.uf.common.dataplugin.radar.level3.generic,
com.raytheon.uf.common.dataplugin.radar.projection,
- com.raytheon.uf.common.dataplugin.radar.request;uses:="com.raytheon.uf.common.serialization.comm",
+ com.raytheon.uf.common.dataplugin.radar.request,
com.raytheon.uf.common.dataplugin.radar.units,
- com.raytheon.uf.common.dataplugin.radar.util;
- uses:="com.raytheon.uf.common.dataplugin.radar,
- com.raytheon.uf.common.datastorage,
- org.geotools.coverage.grid,
- com.raytheon.uf.common.dataplugin.radar.level3,
- javax.measure.converter,
- com.raytheon.uf.common.dataplugin.radar.level3.generic,
- com.vividsolutions.jts.geom,
- com.raytheon.uf.edex.wmo.message,
- org.opengis.referencing.crs"
-Import-Package: com.raytheon.edex.exception,
- com.raytheon.edex.util,
- com.raytheon.uf.common.dataplugin.level,
- com.raytheon.uf.common.dataplugin.text,
- com.raytheon.uf.common.dataplugin.text.db,
- com.raytheon.uf.common.derivparam.tree,
- com.raytheon.uf.common.geospatial,
- com.raytheon.uf.common.localization,
- com.raytheon.uf.common.menus.xml,
- com.raytheon.uf.common.status,
- com.raytheon.uf.common.time,
- com.raytheon.uf.edex.wmo.message,
- javax.measure.converter,
- javax.persistence,
- org.apache.commons.logging,
- org.opengis.referencing.crs
+ com.raytheon.uf.common.dataplugin.radar.util
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/component-deploy.xml
deleted file mode 100644
index 2be9ebb96b..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/component-deploy.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/Activator.java b/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/Activator.java
deleted file mode 100644
index d0d70f4027..0000000000
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/Activator.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.raytheon.uf.common.dataplugin.radar;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-public class Activator implements BundleActivator {
-
- private static BundleContext context;
-
- static BundleContext getContext() {
- return context;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext)
- */
- public void start(BundleContext bundleContext) throws Exception {
- Activator.context = bundleContext;
- }
-
- /*
- * (non-Javadoc)
- * @see org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)
- */
- public void stop(BundleContext bundleContext) throws Exception {
- Activator.context = null;
- }
-
-}
diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
index bc27cebe29..eb53f60740 100644
--- a/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
+++ b/edexOsgi/com.raytheon.uf.common.dataplugin.satellite/src/com/raytheon/uf/common/dataplugin/satellite/SatelliteRecord.java
@@ -209,6 +209,25 @@ public class SatelliteRecord extends PersistablePluginDataObject implements
@DynamicSerializeElement
private SatMapCoverage coverage;
+ /**
+ * No-arg constructor.
+ */
+ public SatelliteRecord() {
+ setPluginName(PLUGIN_ID);
+ }
+
+ /**
+ * Constructs a satellite record from a dataURI
+ *
+ * @param uri
+ * The dataURI
+ * @param tableDef
+ * The table definition associated with this class
+ */
+ public SatelliteRecord(String uri) {
+ super(uri);
+ }
+
@Override
public SatMapCoverage getSpatialObject() {
return coverage;
@@ -254,25 +273,6 @@ public class SatelliteRecord extends PersistablePluginDataObject implements
this.upperRightLon = upperRightLon;
}
- /**
- * No-arg constructor.
- */
- public SatelliteRecord() {
- setPluginName(PLUGIN_ID);
- }
-
- /**
- * Constructs a satellite record from a dataURI
- *
- * @param uri
- * The dataURI
- * @param tableDef
- * The table definition associated with this class
- */
- public SatelliteRecord(String uri) {
- super(uri);
- }
-
public Integer getNumRecords() {
return numRecords;
}
diff --git a/edexOsgi/com.raytheon.uf.common.sounding/META-INF/MANIFEST.MF b/edexOsgi/com.raytheon.uf.common.sounding/META-INF/MANIFEST.MF
index fe03e26a1c..faeed34fa8 100644
--- a/edexOsgi/com.raytheon.uf.common.sounding/META-INF/MANIFEST.MF
+++ b/edexOsgi/com.raytheon.uf.common.sounding/META-INF/MANIFEST.MF
@@ -6,15 +6,13 @@ Bundle-Version: 1.12.1174.qualifier
Bundle-Vendor: RAYTHEON
Eclipse-RegisterBuddy: com.raytheon.uf.common.serialization
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: javax.measure;bundle-version="1.0.0",
- org.geotools;bundle-version="2.5.8",
- com.raytheon.uf.common.time;bundle-version="1.11.31",
- com.raytheon.uf.common.pointdata;bundle-version="1.11.31",
- com.raytheon.uf.common.dataplugin;bundle-version="1.11.31"
+Require-Bundle: com.raytheon.uf.common.pointdata;bundle-version="1.11.31",
+ com.raytheon.uf.common.dataplugin;bundle-version="1.11.31",
+ com.raytheon.uf.common.geospatial;bundle-version="1.12.1174",
+ com.raytheon.uf.common.serialization;bundle-version="1.12.1174",
+ com.raytheon.uf.common.status;bundle-version="1.12.1174",
+ com.raytheon.uf.common.localization;bundle-version="1.12.1174",
+ javax.measure;bundle-version="1.0.0"
Export-Package: com.raytheon.uf.common.sounding,
com.raytheon.uf.common.sounding.adapter,
com.raytheon.uf.common.sounding.util
-Import-Package: com.raytheon.uf.common.localization,
- com.raytheon.uf.common.serialization,
- com.raytheon.uf.common.status,
- org.apache.commons.logging
diff --git a/edexOsgi/com.raytheon.uf.common.topo/component-deploy.xml b/edexOsgi/com.raytheon.uf.common.topo/component-deploy.xml
deleted file mode 100644
index e422fcff56..0000000000
--- a/edexOsgi/com.raytheon.uf.common.topo/component-deploy.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
index 4e29123be7..0232943e67 100644
--- a/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
+++ b/edexOsgi/com.raytheon.uf.common.util/src/com/raytheon/uf/common/util/header/WMOHeaderFinder.java
@@ -47,7 +47,7 @@ import java.util.regex.Pattern;
public class WMOHeaderFinder {
- private static Pattern WMOPATTERN = Pattern
+ public static Pattern WMO_PATTERN = Pattern
.compile("([A-Z]{3}[A-Z0-9](\\d{0,2}|[A-Z]{0,2}) [A-Z0-9 ]{4} "
+ "\\d{6}[^\\r\\n]*)[\\r\\n]+");
@@ -89,7 +89,7 @@ public class WMOHeaderFinder {
byte[] header = new byte[100];
in.read(header);
String sHeader = new String(header, "ISO-8859-1");
- Matcher wmoSearch = WMOPATTERN.matcher(sHeader);
+ Matcher wmoSearch = WMO_PATTERN.matcher(sHeader);
String messageHeader = null;
if (wmoSearch.find()) {
messageHeader = wmoSearch.group();