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

Issue #2491 Remove ISerializableObject references in gfe and mpe viz plugins.

Browse source 
Former-commit-id: f74c39d591d10748f7e66c15c80390389ab5ec25
This commit is contained in:
Ben Steffensmeier 2013-10-25 14:57:33 -05:00
parent 5a99163569
commit 4c03fc93f1
7 changed files with 73 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.viz.gfe/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -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

5
cave/com.raytheon.viz.mpe.ui/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -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

22
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableColumnData.java
View file

@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
/** /**
* <p>Java class for gageTableColumnData complex type. * <p>
* Java class for gageTableColumnData complex type.
* *
* <p>The following schema fragment specifies the expected content contained within this class. * <p>
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="gageTableColumnData"> * &lt;complexType name="gageTableColumnData">
@ -56,7 +57,18 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* <pre>
* *
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "gageTableColumnData", propOrder = { @XmlType(name = "gageTableColumnData", propOrder = {
@ -64,7 +76,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
"width", "width",
"sort" "sort"
}) })
public class GageTableColumnData implements ISerializableObject { public class GageTableColumnData {
@XmlElement(required = true) @XmlElement(required = true)
protected String name; protected String name;

22
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSettings.java
View file

@ -37,13 +37,14 @@ import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
/** /**
* <p>Java class for gageTableSettings complex type. * <p>
* Java class for gageTableSettings complex type.
* *
* <p>The following schema fragment specifies the expected content contained within this class. * <p>
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="gageTableSettings"> * &lt;complexType name="gageTableSettings">
@ -57,14 +58,25 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* <pre>
* *
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/ */
@XmlRootElement(name = "tableSettings") @XmlRootElement(name = "tableSettings")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "gageTableSettings", propOrder = { @XmlType(name = "gageTableSettings", propOrder = {
"column" "column"
}) })
public class GageTableSettings implements ISerializableObject { public class GageTableSettings {
@XmlElements( { @XmlElement(name = "column", type = GageTableColumnData.class) }) @XmlElements( { @XmlElement(name = "column", type = GageTableColumnData.class) })
protected List<GageTableColumnData> column; protected List<GageTableColumnData> column;

22
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/xml/GageTableSortType.java
View file

@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
/** /**
* <p>Java class for gageTableSortType complex type. * <p>
* Java class for gageTableSortType complex type.
* *
* <p>The following schema fragment specifies the expected content contained within this class. * <p>
* The following schema fragment specifies the expected content contained within
* this class.
* *
* <pre> * <pre>
* &lt;complexType name="gageTableSortType"> * &lt;complexType name="gageTableSortType">
@ -53,11 +54,22 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
* &lt;/complexType> * &lt;/complexType>
* </pre> * </pre>
* *
* <pre>
* *
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author bsteffen
* @version 1.0
*/ */
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "gageTableSortType") @XmlType(name = "gageTableSortType")
public class GageTableSortType implements ISerializableObject { public class GageTableSortType {
@XmlAttribute(required = true) @XmlAttribute(required = true)
protected BigInteger order; protected BigInteger order;

23
edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/AdjacentWfoXML.java
View file

@ -27,28 +27,27 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.serialization.ISerializableObject;
/** /**
* TODO Add Description * XML format for a list of {@link CwaXML}.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Dec 22, 2009 mpduff Initial creation * Dec 22, 2009 mpduff Initial creation
* * Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlRootElement(name = "adjacentWFO") @XmlRootElement(name = "adjacentWFO")
@XmlAccessorType(XmlAccessType.NONE) @XmlAccessorType(XmlAccessType.NONE)
public class AdjacentWfoXML implements ISerializableObject{ public class AdjacentWfoXML {
@XmlElements( { @XmlElement(name = "cwa", type = CwaXML.class) }) @XmlElements( { @XmlElement(name = "cwa", type = CwaXML.class) })
private ArrayList<CwaXML> areaIds; private ArrayList<CwaXML> areaIds;

23
edexOsgi/com.raytheon.uf.common.site/src/com/raytheon/uf/common/site/xml/CwaXML.java
View file

@ -27,26 +27,25 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements; 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.
* *
* <pre> * <pre>
* *
* SOFTWARE HISTORY * SOFTWARE HISTORY
* *
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------- -------- ----------- --------------------------
* Dec 22, 2009 mpduff Initial creation * Dec 22, 2009 mpduff Initial creation
* * Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre> * </pre>
* *
* @author mpduff * @author mpduff
* @version 1.0 * @version 1.0
*/ */
@XmlAccessorType(XmlAccessType.NONE) @XmlAccessorType(XmlAccessType.NONE)
public class CwaXML implements ISerializableObject { public class CwaXML {
@XmlAttribute(name = "id") @XmlAttribute(name = "id")
private String id; private String id;