diff --git a/cave/com.raytheon.uf.viz.aviation.advisory/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.aviation.advisory/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index e65e328cd1..0000000000 --- a/cave/com.raytheon.uf.viz.aviation.advisory/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,7 +0,0 @@ -com.raytheon.uf.viz.aviation.advisory.rsc.AdvisoryResourceData -com.raytheon.uf.viz.aviation.advisory.adapter.NonConvSigmetDataAdapter -com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetOutlookDataAdapter -com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetTextDataAdapter -com.raytheon.uf.viz.aviation.advisory.adapter.ConvSigmetCastDataAdapter -com.raytheon.uf.viz.aviation.advisory.adapter.AirmetDataAdapter -com.raytheon.uf.viz.aviation.advisory.adapter.IntlSigmetDataAdapter \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/adapter/AbstractAdvisoryDataAdapter.java b/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/adapter/AbstractAdvisoryDataAdapter.java index 20afc416dc..9301d28eb2 100644 --- a/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/adapter/AbstractAdvisoryDataAdapter.java +++ b/cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/adapter/AbstractAdvisoryDataAdapter.java @@ -22,7 +22,6 @@ package com.raytheon.uf.viz.aviation.advisory.adapter; import java.util.Collection; import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.viz.aviation.advisory.AdvisoryRecord; import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle; @@ -34,17 +33,18 @@ import com.raytheon.uf.viz.core.IGraphicsTarget.LineStyle; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Oct 2, 2009            bsteffen     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 02, 2009           bsteffen    Initial creation
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
  * 
* * @author bsteffen * @version 1.0 */ -public abstract class AbstractAdvisoryDataAdapter implements - ISerializableObject { +public abstract class AbstractAdvisoryDataAdapter { public abstract Collection convertRecords( Collection records); diff --git a/cave/com.raytheon.uf.viz.cloudheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.cloudheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 13b04f848b..0000000000 --- a/cave/com.raytheon.uf.viz.cloudheight/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1 +0,0 @@ -com.raytheon.uf.viz.cloudheight.rsc.CloudHeightResourceData \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.cloudheight/src/com/raytheon/uf/viz/cloudheight/data/CloudHeightData.java b/cave/com.raytheon.uf.viz.cloudheight/src/com/raytheon/uf/viz/cloudheight/data/CloudHeightData.java index 8f2c21cbc2..64bd886f8d 100644 --- a/cave/com.raytheon.uf.viz.cloudheight/src/com/raytheon/uf/viz/cloudheight/data/CloudHeightData.java +++ b/cave/com.raytheon.uf.viz.cloudheight/src/com/raytheon/uf/viz/cloudheight/data/CloudHeightData.java @@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; @@ -39,10 +38,12 @@ import com.raytheon.uf.common.status.UFStatus.Priority; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Dec 16, 2009            mschenke    Initial creation
- * Jul 25, 2013       2190 mschenke    Moved sounding configurations into popup skewt plugin
+ * Date          Ticket#    Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Dec 16, 2009           mschenke    Initial creation
+ * Jul 25, 2013  2190     mschenke    Moved sounding configurations into popup
+ *                                    skewt plugin
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
  * 
  * 
* @@ -51,7 +52,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; */ @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public class CloudHeightData implements ISerializableObject { +public class CloudHeightData { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(CloudHeightData.class); diff --git a/cave/com.raytheon.uf.viz.core.rsc/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.core.rsc/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 080b01d593..0000000000 --- a/cave/com.raytheon.uf.viz.core.rsc/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,2 +0,0 @@ -com.raytheon.uf.viz.core.rsc.FirstAvailableResourceData -com.raytheon.uf.viz.core.rsc.tools.GenericToolsResourceData \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.d2d.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index d10b7853a0..0000000000 --- a/cave/com.raytheon.uf.viz.d2d.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,3 +0,0 @@ -com.raytheon.uf.viz.d2d.core.map.D2DMapRenderableDisplay -com.raytheon.uf.viz.d2d.core.time.D2DTimeMatcher -com.raytheon.uf.viz.d2d.core.D2DLoadProperties \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/D2DLoadProperties.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/D2DLoadProperties.java index b4f0b5731f..36c5a70833 100644 --- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/D2DLoadProperties.java +++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/D2DLoadProperties.java @@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.viz.core.comm.PerspectiveSpecificLoadProperties; import com.raytheon.uf.viz.d2d.core.time.LoadMode; @@ -39,9 +38,11 @@ import com.raytheon.uf.viz.d2d.core.time.TimeMatchingConfiguration; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jul 1, 2009            bgonzale     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Jul 01, 2009           bgonzale    Initial creation
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
  * 
* @@ -50,8 +51,7 @@ import com.raytheon.uf.viz.d2d.core.time.TimeMatchingConfiguration; */ @XmlType(name = "d2dLoadProperties") @XmlAccessorType(XmlAccessType.NONE) -public class D2DLoadProperties extends PerspectiveSpecificLoadProperties - implements ISerializableObject { +public class D2DLoadProperties extends PerspectiveSpecificLoadProperties { private transient TimeMatchingConfiguration timeConfig; diff --git a/cave/com.raytheon.uf.viz.preciprate/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.preciprate/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 6428d590dd..0000000000 --- a/cave/com.raytheon.uf.viz.preciprate/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1 +0,0 @@ -com.raytheon.uf.viz.preciprate.PrecipRateResourceData \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/PrecipRateXML.java b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/PrecipRateXML.java index defafb716f..393c4b259b 100644 --- a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/PrecipRateXML.java +++ b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/PrecipRateXML.java @@ -20,15 +20,16 @@ package com.raytheon.uf.viz.preciprate.xml; /** - * TODO Add Description + * Configuration file format for Precip Rate data. * *
  *
  * SOFTWARE HISTORY
  *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jan 20, 2011            lvenable     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Jan 20, 2011           lvenable    Initial creation
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
  *
  * 
* @@ -40,10 +41,8 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; -import com.raytheon.uf.common.serialization.ISerializableObject; - @XmlAccessorType(XmlAccessType.NONE) -public class PrecipRateXML implements ISerializableObject { +public class PrecipRateXML { @XmlElement(name = "EnumID") private String enumID; diff --git a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/SCANConfigPrecipRateXML.java b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/SCANConfigPrecipRateXML.java index 900600edf7..e43b266cfd 100644 --- a/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/SCANConfigPrecipRateXML.java +++ b/cave/com.raytheon.uf.viz.preciprate/src/com/raytheon/uf/viz/preciprate/xml/SCANConfigPrecipRateXML.java @@ -27,8 +27,6 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; -import com.raytheon.uf.common.serialization.ISerializableObject; - /** * Precip Rate Configuration analogous to legacy dhrParams.txt * @@ -36,9 +34,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jan 18, 2011 6779 grichard Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jan 18, 2011 6779 grichard Initial creation + * Oct 24, 2013 2491 bsteffen Remove ISerializableObject * * * @@ -48,7 +47,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject; @XmlRootElement(name = "ScanConfigPrecipRate") @XmlAccessorType(XmlAccessType.NONE) -public class SCANConfigPrecipRateXML implements ISerializableObject { +public class SCANConfigPrecipRateXML { @XmlElements( { @XmlElement(name = "PrecipRate", type = PrecipRateXML.class) }) private ArrayList precipRates; diff --git a/cave/com.raytheon.uf.viz.xy/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.uf.viz.xy/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index b5e32a24a8..0000000000 --- a/cave/com.raytheon.uf.viz.xy/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,3 +0,0 @@ -com.raytheon.uf.viz.xy.map.InsetMapRenderableDisplay -com.raytheon.uf.viz.xy.graph.XyGraphDescriptor -com.raytheon.uf.viz.xy.map.rsc.GraphResourceData \ No newline at end of file diff --git a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/XyGraphDescriptor.java b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/XyGraphDescriptor.java index 32f1000741..55af0bcb94 100644 --- a/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/XyGraphDescriptor.java +++ b/cave/com.raytheon.uf.viz.xy/src/com/raytheon/uf/viz/xy/graph/XyGraphDescriptor.java @@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import org.geotools.referencing.crs.DefaultEngineeringCRS; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.viz.core.PixelExtent; import com.raytheon.uf.viz.core.drawables.AbstractDescriptor; import com.raytheon.uf.viz.core.drawables.ResourcePair; @@ -43,9 +42,11 @@ import com.vividsolutions.jts.geom.Coordinate; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Sep 29, 2009            mschenke     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Sep 29, 2009           mschenke    Initial creation
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
  * 
* @@ -54,7 +55,7 @@ import com.vividsolutions.jts.geom.Coordinate; */ @XmlAccessorType(XmlAccessType.NONE) public class XyGraphDescriptor extends AbstractDescriptor implements - RemoveListener, ISerializableObject { + RemoveListener { protected int verticalFrameCount = 0; diff --git a/cave/com.raytheon.viz.core.graphing/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.core.graphing/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index dd2fa41704..0000000000 --- a/cave/com.raytheon.viz.core.graphing/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1 +0,0 @@ -com.raytheon.viz.core.graphing.GraphDescriptor \ No newline at end of file diff --git a/cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/GraphDescriptor.java b/cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/GraphDescriptor.java index dad4f696d4..635b223425 100644 --- a/cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/GraphDescriptor.java +++ b/cave/com.raytheon.viz.core.graphing/src/com/raytheon/viz/core/graphing/GraphDescriptor.java @@ -26,7 +26,6 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.geotools.referencing.crs.DefaultEngineeringCRS; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.adapters.CoordAdapter; import com.raytheon.uf.viz.core.PixelExtent; import com.raytheon.uf.viz.core.drawables.AbstractDescriptor; @@ -37,10 +36,12 @@ import com.vividsolutions.jts.geom.Coordinate; * *
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Nov 5, 2007             njensen     Initial creation.
- * Oct 22, 2009 #3348      bsteffen    Moved getter/setters for numberOfFrames down to AbstractDescriptor
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Nov 5, 2007            njensen     Initial creation.
+ * Oct 22, 2009  3348     bsteffen    Moved getter/setters for numberOfFrames
+ *                                    down to AbstractDescriptor
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
  * 
  * 
* @@ -48,8 +49,7 @@ import com.vividsolutions.jts.geom.Coordinate; * @version 1.0 */ @XmlAccessorType(XmlAccessType.NONE) -public class GraphDescriptor extends AbstractDescriptor implements - ISerializableObject { +public class GraphDescriptor extends AbstractDescriptor { protected double zoomLevel = 1.0f; diff --git a/cave/com.raytheon.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 90bcc0c47d..0000000000 --- a/cave/com.raytheon.viz.core/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,3 +0,0 @@ -com.raytheon.viz.core.rsc.BestResResourceData -com.raytheon.viz.core.rsc.BlendedResourceData -com.raytheon.viz.core.topo.TopoResourceData \ No newline at end of file diff --git a/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java b/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java index ee9e7d45dc..dc8a358b45 100644 --- a/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java +++ b/cave/com.raytheon.viz.core/src/com/raytheon/viz/core/rsc/AbstractSpatialEnabler.java @@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import com.raytheon.uf.common.dataplugin.PluginDataObject; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData; /** @@ -33,9 +32,11 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Mar 2, 2010            mnash     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Mar 2, 2010            mnash       Initial creation
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
  * 
* @@ -43,7 +44,7 @@ import com.raytheon.uf.viz.core.rsc.AbstractRequestableResourceData; * @version 1.0 */ @XmlAccessorType(XmlAccessType.NONE) -public abstract class AbstractSpatialEnabler implements ISerializableObject { +public abstract class AbstractSpatialEnabler { public void enable(PluginDataObject d, AbstractRequestableResourceData arrd) { } diff --git a/cave/com.raytheon.viz.pointdata/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.pointdata/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 0b0721e697..0000000000 --- a/cave/com.raytheon.viz.pointdata/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,8 +0,0 @@ -com.raytheon.viz.pointdata.rsc.AdaptivePlotResourceData -com.raytheon.viz.pointdata.rsc.PlotResourceData -com.raytheon.viz.pointdata.rsc.MetarPrecipResourceData -com.raytheon.viz.pointdata.rsc.PlotBlendedResourceData -com.raytheon.viz.pointdata.PlotAlertParser -com.raytheon.viz.pointdata.rsc.retrieve.PointDataPlotInfoRetriever -com.raytheon.viz.pointdata.rsc.retrieve.FullDataPlotInfoRetriever -com.raytheon.viz.pointdata.rsc.retrieve.ScatterometerPlotInfoRetriever \ No newline at end of file diff --git a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java index 9e98ac9b0a..344da42c1a 100644 --- a/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java +++ b/cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/retrieve/AbstractPlotInfoRetriever.java @@ -1,3 +1,22 @@ +/** + * 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.pointdata.rsc.retrieve; import java.util.HashMap; @@ -5,13 +24,34 @@ import java.util.HashMap; import org.opengis.referencing.crs.CoordinateReferenceSystem; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.time.DataTime; import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.uf.viz.core.rsc.IResourceDataChanged; +import com.raytheon.viz.pointdata.PlotInfo; +import com.raytheon.viz.pointdata.rsc.PlotResource2; import com.vividsolutions.jts.geom.Envelope; -public abstract class AbstractPlotInfoRetriever implements ISerializableObject { +/** + * Base class for all objects which can retrieve {@link PlotInfo} objects for + * use in {@link PlotResource2}. For most applications the + * {@link PointDataPlotInfoRetriever} should be used however other instances can + * provide more advanced features such as incremental loading or retrieving + * additional data. + * + *
+ * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
+ * 
+ * + * @author unknown + * @version 1.0 + */ +public abstract class AbstractPlotInfoRetriever { public abstract void getStations(IResourceDataChanged listener, DataTime time, HashMap metadataMap) diff --git a/cave/com.raytheon.viz.radar/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.radar/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 51dbc96ea9..0000000000 --- a/cave/com.raytheon.viz.radar/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,13 +0,0 @@ -com.raytheon.viz.radar.rsc.mosaic.RadarMosaicResourceData -com.raytheon.viz.radar.rsc.RadarResourceData -com.raytheon.viz.radar.rsc.RadarTextResourceData -com.raytheon.viz.radar.RadarSpatialEnabler -com.raytheon.viz.radar.ui.xy.RadarGraphDescriptor -com.raytheon.viz.radar.ui.xy.RadarGraphDisplay -com.raytheon.viz.radar.ui.xy.RadarXYDescriptor -com.raytheon.viz.radar.ui.xy.RadarXYDisplay -com.raytheon.viz.radar.util.VwpAlertParser -com.raytheon.viz.radar.util.RadarPlotInfoRetriever -com.raytheon.viz.radar.rsc.BlendedRadarResourceData -com.raytheon.viz.radar.RadarProductBrowserDataDefinition -com.raytheon.viz.radar.rsc.mosaic.RadarMosaicResourceFactory \ No newline at end of file diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperTextSet.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperTextSet.java index 5bc902e10b..497ba5639c 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperTextSet.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/textcontributors/UpperTextSet.java @@ -33,7 +33,6 @@ import javax.xml.bind.annotation.XmlRootElement; import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.PathManagerFactory; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; @@ -44,9 +43,10 @@ import com.raytheon.uf.common.status.UFStatus.Priority; *
  * 
  * SOFTWARE HISTORY
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Sep 3, 2010            bsteffen     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Sep 3, 2010            bsteffen    Initial creation
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
  * 
  * 
* @@ -56,7 +56,7 @@ import com.raytheon.uf.common.status.UFStatus.Priority; @XmlAccessorType(XmlAccessType.NONE) @XmlRootElement(name = "upperTextSet") -public class UpperTextSet implements ISerializableObject { +public class UpperTextSet { private static final transient IUFStatusHandler statusHandler = UFStatus .getHandler(UpperTextSet.class); diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdAttribute.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdAttribute.java index 3c39eed4e6..cca08a1a9a 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdAttribute.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdAttribute.java @@ -24,19 +24,19 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; /** - * TODO Add Description + * Provides XML format for a dmd attribute in the sample text for dmd products. * *
  * 
  * SOFTWARE HISTORY
  * 
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Jun 6, 2011            jdortiz     Initial creation
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Jun 06, 2011           jdortiz     Initial creation
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
  * 
  * 
* @@ -46,7 +46,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; @XmlRootElement(name = "attribute") @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize -public class DmdAttribute implements ISerializableObject { +public class DmdAttribute { @XmlAttribute(name = "value") private String value; diff --git a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdModifier.java b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdModifier.java index 13ffc6661e..534acda5aa 100644 --- a/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdModifier.java +++ b/cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/util/DmdModifier.java @@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @@ -36,9 +35,10 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jun 6, 2011 jdortiz Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jun 06, 2011 jdortiz Initial creation + * Oct 24, 2013 2491 bsteffen Remove ISerializableObject * * * @@ -49,7 +49,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @XmlRootElement(name = "dmdModifier") @XmlAccessorType(XmlAccessType.NONE) @DynamicSerialize -public class DmdModifier implements ISerializableObject { +public class DmdModifier { @DynamicSerializeElement @XmlElement(name = "attribute", nillable = false)