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

Omaha #3232 Radar code improvements.

Browse source 
Former-commit-id: 8587b9b43b [formerly 696f45d67c5e5b02183f97cfcc139db017f01848]
Former-commit-id: 26325b57be
This commit is contained in:
Ben Steffensmeier 2014-06-04 16:34:27 -05:00
parent d1f5016eb9
commit b8fe181c9a
30 changed files with 235 additions and 308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
View file

@ -37,46 +37,30 @@ import org.opengis.referencing.operation.TransformException;
import com.raytheon.uf.common.dataplugin.radar.RadarDataPoint; import com.raytheon.uf.common.dataplugin.radar.RadarDataPoint;
import com.raytheon.uf.common.dataplugin.radar.RadarDataPoint.RadarProductType; import com.raytheon.uf.common.dataplugin.radar.RadarDataPoint.RadarProductType;
import com.raytheon.uf.common.dataplugin.radar.level3.CellTrendDataPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.CellTrendVolumeScanPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.CorrelatedShearPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.DMDPacket.DMDAttributeIDs; import com.raytheon.uf.common.dataplugin.radar.level3.DMDPacket.DMDAttributeIDs;
import com.raytheon.uf.common.dataplugin.radar.level3.ETVSPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.GFMPacket; import com.raytheon.uf.common.dataplugin.radar.level3.GFMPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.HailPositivePacket;
import com.raytheon.uf.common.dataplugin.radar.level3.HailProbablePacket;
import com.raytheon.uf.common.dataplugin.radar.level3.HdaHailPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.HdaHailPacket.HdaHailPoint; import com.raytheon.uf.common.dataplugin.radar.level3.HdaHailPacket.HdaHailPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.LinkedContourVectorPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.LinkedVector; import com.raytheon.uf.common.dataplugin.radar.level3.LinkedVector;
import com.raytheon.uf.common.dataplugin.radar.level3.LinkedVectorPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.MesocyclonePacket;
import com.raytheon.uf.common.dataplugin.radar.level3.MesocyclonePacket.MesocyclonePoint; import com.raytheon.uf.common.dataplugin.radar.level3.MesocyclonePacket.MesocyclonePoint;
import com.raytheon.uf.common.dataplugin.radar.level3.PrecipDataPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket; import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket.SCITDataCell; import com.raytheon.uf.common.dataplugin.radar.level3.SCITDataPacket.SCITDataCell;
import com.raytheon.uf.common.dataplugin.radar.level3.STICirclePacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SpecialGraphicSymbolPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SpecialGraphicSymbolPacket.SpecialGraphicPoint; import com.raytheon.uf.common.dataplugin.radar.level3.SpecialGraphicSymbolPacket.SpecialGraphicPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.StormIDPacket; import com.raytheon.uf.common.dataplugin.radar.level3.StormIDPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.StormIDPacket.StormIDPoint; import com.raytheon.uf.common.dataplugin.radar.level3.StormIDPacket.StormIDPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.SuperObWindDataPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SymbologyPacket; import com.raytheon.uf.common.dataplugin.radar.level3.SymbologyPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.SymbologyPoint; import com.raytheon.uf.common.dataplugin.radar.level3.SymbologyPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.TVSPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.TVSPacket.TVSPoint; import com.raytheon.uf.common.dataplugin.radar.level3.TVSPacket.TVSPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.TextSymbolPacket; import com.raytheon.uf.common.dataplugin.radar.level3.TextSymbolPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedContourVectorPacket; import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedContourVectorPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedVector; import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedVector;
import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedVectorPacket; import com.raytheon.uf.common.dataplugin.radar.level3.UnlinkedVectorPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.VectorArrowPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.WindBarbPacket;
import com.raytheon.uf.common.dataplugin.radar.level3.WindBarbPacket.WindBarbPoint;
import com.raytheon.uf.common.dataplugin.radar.level3.generic.AreaComponent; import com.raytheon.uf.common.dataplugin.radar.level3.generic.AreaComponent;
import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataComponent; import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataComponent;
import com.raytheon.uf.common.geospatial.ReferencedCoordinate; import com.raytheon.uf.common.geospatial.ReferencedCoordinate;
import com.raytheon.uf.common.geospatial.ReferencedGeometry; import com.raytheon.uf.common.geospatial.ReferencedGeometry;
import com.raytheon.uf.common.geospatial.ReferencedObject.Type; import com.raytheon.uf.common.geospatial.ReferencedObject.Type;
import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.viz.core.DrawableLine; import com.raytheon.uf.viz.core.DrawableLine;
import com.raytheon.uf.viz.core.DrawableString; import com.raytheon.uf.viz.core.DrawableString;
import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.IGraphicsTarget;
@ -109,17 +93,19 @@ import com.vividsolutions.jts.geom.GeometryFactory;
import com.vividsolutions.jts.geom.LineString; import com.vividsolutions.jts.geom.LineString;
/** /**
* TODO Add Description * {@link IRenderable} for displaying a single "page" of radar symbology data.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 8, 2009 chammack Initial creation * Jan 08, 2009 chammack Initial creation
* 03/05/2013 DCS51 zwang Handle GFM product * Mar 05, 2013 DCS51 zwang Handle GFM product
* 06/24/2013 DR16162 zwang Remove "wind behind" * Jun 24, 2013 16162 zwang Remove "wind behind"
* 11/20/2013 2488 randerso Removed use of VeraMono font file * Nov 20, 2013 2488 randerso Removed use of VeraMono font file
* Jun 04, 2014 3232 bsteffen Cleanup.
*
* *
* </pre> * </pre>
* *
@ -128,10 +114,12 @@ import com.vividsolutions.jts.geom.LineString;
*/ */
public class RadarGraphicsPage implements IRenderable { public class RadarGraphicsPage implements IRenderable {
private static final transient IUFStatusHandler statusHandler = UFStatus
.getHandler(RadarGraphicsPage.class);
public static enum CoordinateSystem { public static enum CoordinateSystem {
LOCAL, SCREEN LOCAL, SCREEN
}; }
private IDescriptor descriptor; private IDescriptor descriptor;
@ -239,8 +227,6 @@ public class RadarGraphicsPage implements IRenderable {
public void addSymbologyPacket(SymbologyPacket sp, CoordinateSystem cs) public void addSymbologyPacket(SymbologyPacket sp, CoordinateSystem cs)
throws VizException { throws VizException {
List<ReferencedGeometry> localGeometries = new ArrayList<ReferencedGeometry>(); List<ReferencedGeometry> localGeometries = new ArrayList<ReferencedGeometry>();
// System.out.println("Page : " + page + " Current Packet: "
// + sp.getClass());
if (sp instanceof UnlinkedVectorPacket if (sp instanceof UnlinkedVectorPacket
|| sp instanceof UnlinkedContourVectorPacket) { || sp instanceof UnlinkedContourVectorPacket) {
List<UnlinkedVector> vectors = (List<UnlinkedVector>) RadarHelper List<UnlinkedVector> vectors = (List<UnlinkedVector>) RadarHelper
@ -351,9 +337,9 @@ public class RadarGraphicsPage implements IRenderable {
RadarGraphicFunctions.MesocycloneType.MESOCYCLONE, RadarGraphicFunctions.MesocycloneType.MESOCYCLONE,
color); color);
} catch (TransformException e) { } catch (TransformException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} catch (FactoryException e) { } catch (FactoryException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} }
if (pObject == null) { if (pObject == null) {
@ -385,11 +371,6 @@ public class RadarGraphicsPage implements IRenderable {
pObject.label = stormData.getStormID(); pObject.label = stormData.getStormID();
break POINT; break POINT;
} }
} else if (currPoint instanceof WindBarbPoint) {
} else {
System.out.println("Need to display point: "
+ currPoint.getClass());
} }
} }
} }
@ -399,22 +380,7 @@ public class RadarGraphicsPage implements IRenderable {
for (Integer type : stormData.getDisplayPacketData().keySet()) { for (Integer type : stormData.getDisplayPacketData().keySet()) {
for (SymbologyPacket currPacket : stormData for (SymbologyPacket currPacket : stormData
.getDisplayPacketData().get(type).values()) { .getDisplayPacketData().get(type).values()) {
if (currPacket instanceof CellTrendDataPacket) { if (currPacket instanceof TextSymbolPacket) {
} else if (currPacket instanceof CellTrendVolumeScanPacket) {
} else if (currPacket instanceof HailProbablePacket) {
} else if (currPacket instanceof HailPositivePacket) {
} else if (currPacket instanceof HdaHailPacket) {
} else if (currPacket instanceof LinkedVectorPacket
|| currPacket instanceof LinkedContourVectorPacket) {
} else if (currPacket instanceof CorrelatedShearPacket) {
} else if (currPacket instanceof MesocyclonePacket) {
} else if (currPacket instanceof PrecipDataPacket) {
} else if (currPacket instanceof SCITDataPacket) {
} else if (currPacket instanceof SpecialGraphicSymbolPacket) {
} else if (currPacket instanceof STICirclePacket) {
} else if (currPacket instanceof StormIDPacket) {
} else if (currPacket instanceof SuperObWindDataPacket) {
} else if (currPacket instanceof TextSymbolPacket) {
TextSymbolPacket tsp = (TextSymbolPacket) currPacket; TextSymbolPacket tsp = (TextSymbolPacket) currPacket;
if ("\" ".equals(tsp.getTheText())) { if ("\" ".equals(tsp.getTheText())) {
if (RadarDisplayManager.getInstance() if (RadarDisplayManager.getInstance()
@ -430,15 +396,6 @@ public class RadarGraphicsPage implements IRenderable {
getImage((TextSymbolPacket) currPacket, cs, getImage((TextSymbolPacket) currPacket, cs,
localMap, screenMap); localMap, screenMap);
} }
} else if (currPacket instanceof ETVSPacket) {
} else if (currPacket instanceof TVSPacket) {
} else if (currPacket instanceof UnlinkedVectorPacket
|| currPacket instanceof UnlinkedContourVectorPacket) {
} else if (currPacket instanceof VectorArrowPacket) {
} else if (currPacket instanceof WindBarbPacket) {
} else {
System.out.println("Need to display packet: "
+ currPacket.getClass());
} }
} }
} }
@ -878,11 +835,11 @@ public class RadarGraphicsPage implements IRenderable {
this.localStringMap.put(coordID, mesoID); this.localStringMap.put(coordID, mesoID);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} catch (TransformException e) { } catch (TransformException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} catch (FactoryException e) { } catch (FactoryException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} }
} }
} }
@ -1137,9 +1094,9 @@ public class RadarGraphicsPage implements IRenderable {
break; break;
} }
} catch (TransformException e) { } catch (TransformException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} catch (FactoryException e) { } catch (FactoryException e) {
e.printStackTrace(); statusHandler.error(e.getLocalizedMessage(), e);
} }
return images; return images;

12
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/AlertAdaptationParameters.java
View file

@ -23,7 +23,6 @@ import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -33,9 +32,10 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* July 31, 2009 askripsky Initial creation * Jul 31, 2009 askripsky Initial creation
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class AlertAdaptationParameters implements ISerializableObject { public class AlertAdaptationParameters {
@DynamicSerializeElement @DynamicSerializeElement
protected ArrayList<AAPCategory> categories; protected ArrayList<AAPCategory> categories;
@ -57,7 +57,7 @@ public class AlertAdaptationParameters implements ISerializableObject {
} }
@DynamicSerialize @DynamicSerialize
public static class AAPCategory implements ISerializableObject { public static class AAPCategory {
@DynamicSerializeElement @DynamicSerializeElement
protected int alertGroup; protected int alertGroup;

12
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/AlertMessage.java
View file

@ -21,20 +21,20 @@ package com.raytheon.uf.common.dataplugin.radar.level3;
import java.util.Date; import java.util.Date;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * Object representation of the alert message radar product(productCode 9).
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Aug 4, 2011 mnash Initial creation * Aug 04, 2011 mnash Initial creation
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -43,7 +43,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class AlertMessage implements ISerializableObject { public class AlertMessage {
public enum AlertCategory { public enum AlertCategory {
Empty, GRID_Velocity, GRID_Composite_Reflectivity, GRID_Echo_Tops, GRID_Severe_Weather_Probability, GRID_Spare, GRID_Vertically_Integrated_Liquid, VOLUME_Velocity_Azimuth_Display, VOLUME_Minimum_Size_Hail, VOLUME_Spare, VOLUME_Tornado_Vortex_Signature, VOLUME_Maximum_Storm_Reflectivity, VOLUME_Probability_of_Hail, VOLUME_Storm_Top, VOLUME_Maximum_1_Hour_Rainfall_Accumulation, VOLUME_MDA_Strength_Rank, VOLUME_Spare1, FORECAST_Maximum_Hail_Size, FORECAST_Spare, FORECAST_Tornado_Vortex_Signature, FORECAST_Maximum_Storm_Reflectivity, FORECAST_Probability_of_Hail, FORECAST_Probability_of_Severe_Hail, FORECAST_Storm_Top, FORECAST_MDA_Strength_Rank, FORECAST_Spare1 Empty, GRID_Velocity, GRID_Composite_Reflectivity, GRID_Echo_Tops, GRID_Severe_Weather_Probability, GRID_Spare, GRID_Vertically_Integrated_Liquid, VOLUME_Velocity_Azimuth_Display, VOLUME_Minimum_Size_Hail, VOLUME_Spare, VOLUME_Tornado_Vortex_Signature, VOLUME_Maximum_Storm_Reflectivity, VOLUME_Probability_of_Hail, VOLUME_Storm_Top, VOLUME_Maximum_1_Hour_Rainfall_Accumulation, VOLUME_MDA_Strength_Rank, VOLUME_Spare1, FORECAST_Maximum_Hail_Size, FORECAST_Spare, FORECAST_Tornado_Vortex_Signature, FORECAST_Maximum_Storm_Reflectivity, FORECAST_Probability_of_Hail, FORECAST_Probability_of_Severe_Hail, FORECAST_Storm_Top, FORECAST_MDA_Strength_Rank, FORECAST_Spare1

17
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/CellTrendDataPacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Feb 19, 2009 mnash Initial creation * Feb 19, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class CellTrendDataPacket extends SymbologyPacket implements public class CellTrendDataPacket extends SymbologyPacket {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
private String cellID; private String cellID;
@ -68,8 +67,7 @@ public class CellTrendDataPacket extends SymbologyPacket implements
private ArrayList<Integer> volumeScan; private ArrayList<Integer> volumeScan;
@DynamicSerialize @DynamicSerialize
public static class CellTrendData implements SymbologyPoint, public static class CellTrendData implements SymbologyPoint {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
private int trendCode; private int trendCode;
@ -159,7 +157,6 @@ public class CellTrendDataPacket extends SymbologyPacket implements
int latestScan = 0; int latestScan = 0;
int bytesRead = 8; int bytesRead = 8;
CellTrendData trendData; CellTrendData trendData;
ArrayList<Integer> data;
while (bytesRead < blockLength) { while (bytesRead < blockLength) {
// Read current Trend Code // Read current Trend Code
trendCode = in.readShort(); trendCode = in.readShort();

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/CellTrendVolumeScanPacket.java
View file

@ -23,27 +23,26 @@ import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * Radar packet for cell trend volume scan.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 29, 2009 mnash Initial creation * Jan 29, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* </pre> * </pre>
* *
* @author mnash * @author mnash
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class CellTrendVolumeScanPacket extends SymbologyPacket implements public class CellTrendVolumeScanPacket extends SymbologyPacket {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
private int numberOfVolumes; private int numberOfVolumes;

17
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/GSMBlock.java
View file

@ -22,7 +22,6 @@ package com.raytheon.uf.common.dataplugin.radar.level3;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -31,11 +30,13 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 1-26-2009 mnash Initial creation * Jan 26, 2009 mnash Initial creation
* 1-20-2010 DR 4059 Zihou Wang Decode more GSM status * Jan 20, 2010 4059 Zihou Wang Decode more GSM status
* 03/01/13 DR15496 zwang Decode expanded GSM * Mar 01, 2013 15496 zwang Decode expanded GSM
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mnash * @author mnash
@ -43,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class GSMBlock extends AbstractBlock implements ISerializableObject { public class GSMBlock extends AbstractBlock {
private static final int BLOCK_ID = 2; private static final int BLOCK_ID = 2;
@ -60,7 +61,7 @@ public class GSMBlock extends AbstractBlock implements ISerializableObject {
} }
@DynamicSerialize @DynamicSerialize
public static class GSMMessage implements ISerializableObject { public static class GSMMessage {
@DynamicSerializeElement @DynamicSerializeElement
public int mode; public int mode;

16
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/GenericDataPacket.java
View file

@ -26,7 +26,6 @@ import java.util.List;
import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataComponent; import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataComponent;
import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataParameter; import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericDataParameter;
import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericUtil; import com.raytheon.uf.common.dataplugin.radar.level3.generic.GenericUtil;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -36,10 +35,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Mar 4, 2009 mnash Initial creation * Mar 04, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -48,8 +48,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class GenericDataPacket extends SymbologyPacket implements public class GenericDataPacket extends SymbologyPacket {
ISerializableObject {
public GenericDataPacket(int packetId, DataInputStream in) public GenericDataPacket(int packetId, DataInputStream in)
throws IOException { throws IOException {
@ -189,9 +188,6 @@ public class GenericDataPacket extends SymbologyPacket implements
*/ */
public void setGenTime(long genTime) { public void setGenTime(long genTime) {
this.genTime = genTime; this.genTime = genTime;
long timestamp = genTime * 1000; // msec
java.util.Date d = new java.util.Date(timestamp);
} }
/** /**

12
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/GraphicBlock.java
View file

@ -25,18 +25,18 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * A block of data containing graphics organized into multiple pages.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,7 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class GraphicBlock extends AbstractBlock implements ISerializableObject { public class GraphicBlock extends AbstractBlock {
private static final int BLOCK_ID = 2; private static final int BLOCK_ID = 2;

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/HailPositivePacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Feb 19, 2009 mnash Initial creation * Feb 19, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class HailPositivePacket extends SymbologyPacket implements public class HailPositivePacket extends SymbologyPacket {
ISerializableObject {
public HailPositivePacket(int packetId, DataInputStream in) public HailPositivePacket(int packetId, DataInputStream in)
throws IOException { throws IOException {
@ -59,7 +58,7 @@ public class HailPositivePacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class HailPoint implements ISerializableObject { public static class HailPoint {
@DynamicSerializeElement @DynamicSerializeElement
public int i; public int i;

21
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/HailProbablePacket.java
View file

@ -19,16 +19,20 @@
**/ **/
package com.raytheon.uf.common.dataplugin.radar.level3; package com.raytheon.uf.common.dataplugin.radar.level3;
import java.io.DataInputStream;
import java.io.IOException;
/** /**
* Hail probable uses the same decoder as TVS * Hail probable uses the same decoder as TVS
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Feb 19, 2009 mnash Initial creation * Feb 19, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Add constructors.
* *
* </pre> * </pre>
* *
@ -38,4 +42,13 @@ package com.raytheon.uf.common.dataplugin.radar.level3;
public class HailProbablePacket extends HailPositivePacket { public class HailProbablePacket extends HailPositivePacket {
public HailProbablePacket(int packetId, DataInputStream in)
throws IOException {
super(packetId, in);
}
public HailProbablePacket() {
super();
}
} }

18
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/HdaHailPacket.java
View file

@ -24,19 +24,19 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * {@link SymbologyPacket} representing multiple points of hda hail.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Nov 5, 2008 mnash Initial creation * Nov 05, 2008 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* </pre> * </pre>
* *
* @author mnash * @author mnash
@ -44,8 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class HdaHailPacket extends SymbologyPacket implements public class HdaHailPacket extends SymbologyPacket {
ISerializableObject {
public HdaHailPacket(int packetId, DataInputStream in) throws IOException { public HdaHailPacket(int packetId, DataInputStream in) throws IOException {
super(packetId, in); super(packetId, in);
@ -56,8 +55,7 @@ public class HdaHailPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class HdaHailPoint implements SymbologyPoint, public static class HdaHailPoint implements SymbologyPoint {
ISerializableObject {
public int getI() { public int getI() {
return i; return i;

12
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/Layer.java
View file

@ -19,20 +19,20 @@
**/ **/
package com.raytheon.uf.common.dataplugin.radar.level3; package com.raytheon.uf.common.dataplugin.radar.level3;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* *
* TODO Add Description * A Layer represnets a group of {@link SymbologyPacket}s.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 8, 2009 chammack Initial creation * Jan 08, 2009 chammack Initial creation
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -40,7 +40,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class Layer implements ISerializableObject { public class Layer {
@DynamicSerializeElement @DynamicSerializeElement
private int layerId; private int layerId;

13
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/LinkedContourVectorPacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Mar 9, 2009 mnash Initial creation * Mar 09, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class LinkedContourVectorPacket extends SymbologyPacket implements public class LinkedContourVectorPacket extends SymbologyPacket {
ISerializableObject {
private static final int CONTOUR_VECTOR_PACKET0E03 = 0x0E03; private static final int CONTOUR_VECTOR_PACKET0E03 = 0x0E03;

14
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/LinkedVector.java
View file

@ -19,28 +19,28 @@
**/ **/
package com.raytheon.uf.common.dataplugin.radar.level3; package com.raytheon.uf.common.dataplugin.radar.level3;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * LinkedVectors are used within {@link SymbologyPacket}s to represent a single
* graphical line in a specific color.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ -------- ----------- --------------------------
* Sep 14, 2010 mnash Initial creation * Sep 14, 2010 mnash Initial creation
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
* @author mnash * @author mnash
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class LinkedVector implements ISerializableObject { public class LinkedVector {
@DynamicSerializeElement @DynamicSerializeElement
protected int theColor; protected int theColor;

16
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/LinkedVectorPacket.java
View file

@ -24,27 +24,27 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * A type of {@link SymbologyPacket} containing {@link LinkedVector}s
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Nov 5, 2008 mnash Initial creation * Nov 05, 2008 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mnash * @author mnash
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class LinkedVectorPacket extends SymbologyPacket implements public class LinkedVectorPacket extends SymbologyPacket {
ISerializableObject {
private static final int LINKED_VECTOR_PACKET9 = 9; private static final int LINKED_VECTOR_PACKET9 = 9;
/** /**

16
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/MesocyclonePacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 13, 2009 chammack Initial creation * Jan 13, 2009 chammack Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class MesocyclonePacket extends SymbologyPacket implements public class MesocyclonePacket extends SymbologyPacket {
ISerializableObject {
public MesocyclonePacket(int packetId, DataInputStream in) public MesocyclonePacket(int packetId, DataInputStream in)
throws IOException { throws IOException {
@ -59,8 +58,7 @@ public class MesocyclonePacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class MesocyclonePoint implements SymbologyPoint, public static class MesocyclonePoint implements SymbologyPoint {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
protected int mesoCycloneRadius; protected int mesoCycloneRadius;

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/SCITDataPacket.java
View file

@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.dataplugin.radar.level3.STICirclePacket.STICirclePoint; import com.raytheon.uf.common.dataplugin.radar.level3.STICirclePacket.STICirclePoint;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -35,10 +34,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 28, 2009 mnash Initial creation * Jan 28, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -47,8 +47,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class SCITDataPacket extends SymbologyPacket implements public class SCITDataPacket extends SymbologyPacket {
ISerializableObject {
public SCITDataPacket(int packetId, DataInputStream in) throws IOException { public SCITDataPacket(int packetId, DataInputStream in) throws IOException {
super(packetId, in); super(packetId, in);
@ -63,7 +62,7 @@ public class SCITDataPacket extends SymbologyPacket implements
* STIDataPoints * STIDataPoints
*/ */
@DynamicSerialize @DynamicSerialize
public static class SCITDataCell implements ISerializableObject { public static class SCITDataCell {
@DynamicSerializeElement @DynamicSerializeElement
public List<LinkedVector> vectors = new ArrayList<LinkedVector>(); public List<LinkedVector> vectors = new ArrayList<LinkedVector>();

17
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/STICirclePacket.java
View file

@ -24,19 +24,19 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * A {@link SymbologyPacket} containing multiple {@link STICirclePoint}s.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 1-26-2009 mnash Initial Creation * Jan 26, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,8 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class STICirclePacket extends SymbologyPacket implements public class STICirclePacket extends SymbologyPacket {
ISerializableObject {
/** /**
* @param packetId * @param packetId
@ -61,7 +60,7 @@ public class STICirclePacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class STICirclePoint implements ISerializableObject { public static class STICirclePoint {
@DynamicSerializeElement @DynamicSerializeElement
public int i; public int i;

19
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/SpecialGraphicSymbolPacket.java
View file

@ -24,27 +24,27 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * A packet for holding special graphics symbols.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Nov 5, 2008 mnash Initial creation * Nov 05, 2008 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mnash * @author mnash
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class SpecialGraphicSymbolPacket extends SymbologyPacket implements public class SpecialGraphicSymbolPacket extends SymbologyPacket {
ISerializableObject {
/** /**
* @param packetId * @param packetId
@ -61,8 +61,7 @@ public class SpecialGraphicSymbolPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class SpecialGraphicPoint implements SymbologyPoint, public static class SpecialGraphicPoint implements SymbologyPoint {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
public int i; public int i;

17
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/StormIDPacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -33,10 +32,12 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Nov 5, 2008 mnash Initial creation * Nov 05, 2008 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mnash * @author mnash
@ -44,8 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class StormIDPacket extends SymbologyPacket implements public class StormIDPacket extends SymbologyPacket {
ISerializableObject {
public StormIDPacket(int packetId, DataInputStream in) throws IOException { public StormIDPacket(int packetId, DataInputStream in) throws IOException {
super(packetId, in); super(packetId, in);
@ -56,8 +56,7 @@ public class StormIDPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class StormIDPoint implements SymbologyPoint, public static class StormIDPoint implements SymbologyPoint {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
public int i; public int i;

17
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/SuperObWindDataPacket.java
View file

@ -24,19 +24,19 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * {@link SymbologyPacket} containing {@link SuperObWindDataCell}s.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 1-26-2009 465 mnash Initial Creation * Jan 26, 2009 465 mnash Initial Creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,8 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class SuperObWindDataPacket extends SymbologyPacket implements public class SuperObWindDataPacket extends SymbologyPacket {
ISerializableObject {
/** /**
* @param packetId * @param packetId
@ -62,7 +61,7 @@ public class SuperObWindDataPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class SuperObWindDataCell implements ISerializableObject { public static class SuperObWindDataCell {
@DynamicSerializeElement @DynamicSerializeElement
public int latitudeLSW; public int latitudeLSW;

31
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/SymbologyBlock.java
View file

@ -25,7 +25,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -35,11 +34,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 11-02-2007 465 randerso Major revision to support full level 3 radar decode * Nov 02, 2007 465 randerso Major revision to support full level 3 radar decode
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* * Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -47,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class SymbologyBlock extends AbstractBlock implements public class SymbologyBlock extends AbstractBlock {
ISerializableObject {
private static final int BLOCK_ID = 1; private static final int BLOCK_ID = 1;
@ -137,23 +135,6 @@ public class SymbologyBlock extends AbstractBlock implements
this.layers = layerList.toArray(new Layer[layerList.size()]); this.layers = layerList.toArray(new Layer[layerList.size()]);
} }
/**
* This method will return an object representing the layer number passed
* in. This method will examine the layer and create and instance of its
* actual type (i.e. Radial) and return that layer.<br/>
* <br/>
* <b>Important</b> Presently, only radial data is supported. All others
* will return null.
*
* @return An object for that layer
* @throws IOException
*/
public SymbologyPacket getSymbologyLayerContent(int layerNumber)
throws IOException {
SymbologyPacket symLayer = null;
return symLayer;
}
/** /**
* Returns the number of symbology layers contained with the block. Most * Returns the number of symbology layers contained with the block. Most
* likely, this will be 1, but in case a file contains more, they can be * likely, this will be 1, but in case a file contains more, they can be

14
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/TVSPacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Jan 13, 2009 chammack Initial creation * Jan 13, 2009 chammack Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,7 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class TVSPacket extends SymbologyPacket implements ISerializableObject { public class TVSPacket extends SymbologyPacket {
public TVSPacket(int packetId, DataInputStream in) throws IOException { public TVSPacket(int packetId, DataInputStream in) throws IOException {
super(packetId, in); super(packetId, in);
@ -59,7 +59,7 @@ public class TVSPacket extends SymbologyPacket implements ISerializableObject {
protected final boolean isElevated = false; protected final boolean isElevated = false;
@DynamicSerialize @DynamicSerialize
public static class TVSPoint implements SymbologyPoint, ISerializableObject { public static class TVSPoint implements SymbologyPoint {
@DynamicSerializeElement @DynamicSerializeElement
public boolean elevated = false; public boolean elevated = false;

11
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/TabularBlock.java
View file

@ -26,18 +26,17 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants; import com.raytheon.uf.common.dataplugin.radar.util.RadarConstants;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * Object representing a block of tabular data.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* * Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,7 +45,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class TabularBlock extends AbstractBlock implements ISerializableObject { public class TabularBlock extends AbstractBlock {
private static final int BLOCK_ID = 3; private static final int BLOCK_ID = 3;

13
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/TextSymbolPacket.java
View file

@ -22,18 +22,18 @@ package com.raytheon.uf.common.dataplugin.radar.level3;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.IOException; import java.io.IOException;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * A {@link SymbologyPacket} representing colored text.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -41,8 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class TextSymbolPacket extends SymbologyPacket implements public class TextSymbolPacket extends SymbologyPacket {
ISerializableObject {
private static final int TEXT_SYMBOL_PACKET8 = 8; private static final int TEXT_SYMBOL_PACKET8 = 8;

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/UnlinkedContourVectorPacket.java
View file

@ -24,19 +24,19 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * {@link SymbologyPacket} containing contours of {@link UnlinkedVector}s.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Sep 14, 2010 mnash Initial creation * Sep 14, 2010 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,8 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
public class UnlinkedContourVectorPacket extends SymbologyPacket implements public class UnlinkedContourVectorPacket extends SymbologyPacket {
ISerializableObject {
private static final int CONTOUR_VECTOR_PACKET3501 = 0x3501; private static final int CONTOUR_VECTOR_PACKET3501 = 0x3501;
/** /**

13
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/UnlinkedVector.java
View file

@ -19,19 +19,20 @@
**/ **/
package com.raytheon.uf.common.dataplugin.radar.level3; package com.raytheon.uf.common.dataplugin.radar.level3;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * UnlinkedVectors are used within {@link SymbologyPacket}s to represent a
* single graphical line in a specific color.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Sep 14, 2010 mnash Initial creation * Sep 14, 2010 mnash Initial creation
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -40,7 +41,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class UnlinkedVector implements ISerializableObject { public class UnlinkedVector {
@DynamicSerializeElement @DynamicSerializeElement
private int theColor; private int theColor;

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/UnlinkedVectorPacket.java
View file

@ -24,19 +24,19 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* TODO Add Description * {@link SymbologyPacket} containing {@link UnlinkedVector}s.
* *
* <pre> * <pre>
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 11-05-2007 465 randerso Initial Creation * Nuv 05, 2007 465 randerso Initial Creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -44,8 +44,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* @version 1.0 * @version 1.0
*/ */
@DynamicSerialize @DynamicSerialize
public class UnlinkedVectorPacket extends SymbologyPacket implements public class UnlinkedVectorPacket extends SymbologyPacket {
ISerializableObject {
private static final int UNLINKED_VECTOR_PACKET10 = 10; private static final int UNLINKED_VECTOR_PACKET10 = 10;

15
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/VectorArrowPacket.java
View file

@ -24,7 +24,6 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
@ -34,10 +33,11 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Feb 19, 2009 mnash Initial creation * Feb 19, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class VectorArrowPacket extends SymbologyPacket implements public class VectorArrowPacket extends SymbologyPacket {
ISerializableObject {
public VectorArrowPacket(int packetId, DataInputStream in) public VectorArrowPacket(int packetId, DataInputStream in)
throws IOException { throws IOException {
@ -59,7 +58,7 @@ public class VectorArrowPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class VectorArrow implements ISerializableObject { public static class VectorArrow {
@DynamicSerializeElement @DynamicSerializeElement
protected int arrowDirection; protected int arrowDirection;

18
edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/level3/WindBarbPacket.java
View file

@ -24,20 +24,20 @@ import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
/** /**
* Decodes the (non-DMD) mesocyclone packet * Decodes the wind barb packet.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* 1-23-2009 mnash Initial creation * Jan 23, 2009 mnash Initial creation
* 07/29/2013 2148 mnash Refactor registering of packets to Spring * Jul 29, 2013 2148 mnash Refactor registering of packets to Spring
* Jun 04, 2014 3232 bsteffen Remove ISerializableObject
* *
* </pre> * </pre>
* *
@ -46,8 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
*/ */
@DynamicSerialize @DynamicSerialize
public class WindBarbPacket extends SymbologyPacket implements public class WindBarbPacket extends SymbologyPacket {
ISerializableObject {
public WindBarbPacket(int packetId, DataInputStream in) throws IOException { public WindBarbPacket(int packetId, DataInputStream in) throws IOException {
super(packetId, in); super(packetId, in);
@ -58,8 +57,7 @@ public class WindBarbPacket extends SymbologyPacket implements
} }
@DynamicSerialize @DynamicSerialize
public static class WindBarbPoint implements SymbologyPoint, public static class WindBarbPoint implements SymbologyPoint {
ISerializableObject {
@DynamicSerializeElement @DynamicSerializeElement
protected int colorValue; protected int colorValue;