diff --git a/cave/com.raytheon.viz.gfe/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.gfe/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 47f8ae7614..0000000000 --- a/cave/com.raytheon.viz.gfe/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,7 +0,0 @@ -com.raytheon.viz.gfe.core.GFEMapRenderableDisplay -com.raytheon.viz.gfe.core.GFETimeMatcher -com.raytheon.viz.gfe.core.GFEIntervalTimeMatcher -com.raytheon.viz.gfe.rsc.GFELegendResourceData -com.raytheon.viz.gfe.rsc.GFEResourceData -com.raytheon.uf.common.site.xml.AdjacentWfoXML -com.raytheon.uf.common.site.xml.CwaXML diff --git a/cave/com.raytheon.viz.mpe.ui/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.mpe.ui/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index c712423f98..0000000000 --- a/cave/com.raytheon.viz.mpe.ui/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,5 +0,0 @@ -com.raytheon.viz.mpe.ui.rsc.MPERadarRingOverlayResourceData -com.raytheon.viz.mpe.ui.displays.MPEMapRenderableDisplay -com.raytheon.viz.mpe.ui.displays.MPETimeMatcher -com.raytheon.viz.mpe.ui.rsc.RadarGageOverlayRscData -com.raytheon.viz.mpe.ui.rsc.MPEFieldResourceData \ No newline at end of file diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableColumnData.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableColumnData.java index d9381e45f9..1d7885d8b2 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableColumnData.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableColumnData.java @@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; -import com.raytheon.uf.common.serialization.ISerializableObject; - /** - *

Java class for gageTableColumnData complex type. + *

+ * Java class for gageTableColumnData complex type. * - *

The following schema fragment specifies the expected content contained within this class. + *

+ * The following schema fragment specifies the expected content contained within + * this class. * *

  * <complexType name="gageTableColumnData">
@@ -56,7 +57,18 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * </complexType>
  * 
* + *
  * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
+ * 
+ * + * @author bsteffen + * @version 1.0 */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "gageTableColumnData", propOrder = { @@ -64,7 +76,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject; "width", "sort" }) -public class GageTableColumnData implements ISerializableObject { +public class GageTableColumnData { @XmlElement(required = true) protected String name; diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSettings.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSettings.java index 79e588c0af..60320938b7 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSettings.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSettings.java @@ -37,13 +37,14 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; -import com.raytheon.uf.common.serialization.ISerializableObject; - /** - *

Java class for gageTableSettings complex type. + *

+ * Java class for gageTableSettings complex type. * - *

The following schema fragment specifies the expected content contained within this class. + *

+ * The following schema fragment specifies the expected content contained within + * this class. * *

  * <complexType name="gageTableSettings">
@@ -57,14 +58,25 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * </complexType>
  * 
* + *
  * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
+ * 
+ * + * @author bsteffen + * @version 1.0 */ @XmlRootElement(name = "tableSettings") @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "gageTableSettings", propOrder = { "column" }) -public class GageTableSettings implements ISerializableObject { +public class GageTableSettings { @XmlElements( { @XmlElement(name = "column", type = GageTableColumnData.class) }) protected List column; diff --git a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSortType.java b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSortType.java index 3cf29e95aa..748e991bf1 100644 --- a/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSortType.java +++ b/cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSortType.java @@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; -import com.raytheon.uf.common.serialization.ISerializableObject; - /** - *

Java class for gageTableSortType complex type. + *

+ * Java class for gageTableSortType complex type. * - *

The following schema fragment specifies the expected content contained within this class. + *

+ * The following schema fragment specifies the expected content contained within + * this class. * *

  * <complexType name="gageTableSortType">
@@ -53,11 +54,22 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * </complexType>
  * 
* + *
  * 
+ * SOFTWARE HISTORY
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Oct 23, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
+ * 
+ * + * @author bsteffen + * @version 1.0 */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "gageTableSortType") -public class GageTableSortType implements ISerializableObject { +public class GageTableSortType { @XmlAttribute(required = true) protected BigInteger order; diff --git a/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/AdjacentWfoXML.java b/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/AdjacentWfoXML.java index 5b820c6fe0..deeaf6a26b 100644 --- a/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/AdjacentWfoXML.java +++ b/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/AdjacentWfoXML.java @@ -27,28 +27,27 @@ 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; - /** - * TODO Add Description + * XML format for a list of {@link CwaXML}. * *
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Dec 22, 2009            mpduff     Initial creation
- *
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Dec 22, 2009           mpduff      Initial creation
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
- * + * * @author mpduff - * @version 1.0 + * @version 1.0 */ @XmlRootElement(name = "adjacentWFO") @XmlAccessorType(XmlAccessType.NONE) -public class AdjacentWfoXML implements ISerializableObject{ +public class AdjacentWfoXML { @XmlElements( { @XmlElement(name = "cwa", type = CwaXML.class) }) private ArrayList areaIds; diff --git a/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/CwaXML.java b/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/CwaXML.java index 2515f30a0e..15ddd8cfb7 100644 --- a/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/CwaXML.java +++ b/edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/CwaXML.java @@ -27,26 +27,25 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; -import com.raytheon.uf.common.serialization.ISerializableObject; - /** - * TODO Add Description + * Xml format of a cwa including its id and the ids of adjacent cwas. * *
- *
+ * 
  * SOFTWARE HISTORY
- *
- * Date         Ticket#    Engineer    Description
- * ------------ ---------- ----------- --------------------------
- * Dec 22, 2009            mpduff     Initial creation
- *
+ * 
+ * Date          Ticket#  Engineer    Description
+ * ------------- -------- ----------- --------------------------
+ * Dec 22, 2009           mpduff      Initial creation
+ * Oct 24, 2013  2491     bsteffen    Remove ISerializableObject
+ * 
  * 
- * + * * @author mpduff - * @version 1.0 + * @version 1.0 */ @XmlAccessorType(XmlAccessType.NONE) -public class CwaXML implements ISerializableObject { +public class CwaXML { @XmlAttribute(name = "id") private String id;