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

Issue #2491 Remove ISerializableObject references in uf.viz.monitor plugins.

Browse source 
Former-commit-id: 54130af4c9 [formerly a629f974a5] [formerly de02c88451a8ddfee21be1432313918cb2a173ac [formerly 88ad284e71]] [formerly 3150d960e8 [formerly 88ad284e71 [formerly 16993be4fde0154ea58e4bc55cbecaabdc44b3cb]]]
Former-commit-id: 3150d960e8
Former-commit-id: a38be6aaa816c5c84d60730b77824580d18d9898 [formerly 4311d8ea4c]
Former-commit-id: 237d947086
This commit is contained in:
Ben Steffensmeier 2013-10-25 14:56:14 -05:00
parent 264555b5d7
commit 13829ffd04
12 changed files with 112 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.uf.viz.monitor.ffmp/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.ffmp.ui.rsc.FFMPResourceData

12
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPConfigBasinXML.java
View file

@ -29,8 +29,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;
/**
* Config Basin xml object.
*
@ -38,10 +36,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Initial creation
* Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 12, 2013 1902 mpduff Return a FFMPTableColumnXML object.
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -49,7 +47,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "FfmpConfigBasin")
@XmlAccessorType(XmlAccessType.NONE)
public class FFMPConfigBasinXML implements ISerializableObject {
public class FFMPConfigBasinXML {
/**
* When on, the Basin Table will use the time of the D2D frame that launched
* it. When off the Basin Table will either use the most recent time in the

18
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/xml/FFMPTableColumnXML.java
View file

@ -23,10 +23,22 @@ 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;
/**
* Table column xml object.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
*/
@XmlAccessorType(XmlAccessType.NONE)
public class FFMPTableColumnXML implements ISerializableObject
public class FFMPTableColumnXML
{
@XmlElement(name = "ColumnName")
private String columnName;

1
cave/com.raytheon.uf.viz.monitor.fog/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1 +0,0 @@
com.raytheon.uf.viz.monitor.fog.ui.resource.FogResourceData

23
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/xml/FogMonitorAlgorithmXML.java
View file

@ -24,12 +24,27 @@ 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;
/**
*
* Class for serialization of xml describing a fog monitor algorithm.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Oct 24, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author unknown
* @version 1.0
*/
@XmlRootElement(name = "FogMonitorAlgorithm")
@XmlAccessorType(XmlAccessType.NONE)
public class FogMonitorAlgorithmXML implements ISerializableObject
{
public class FogMonitorAlgorithmXML {
@XmlElement(name = "FogProductYLo")
private double fogProductYLo;

2
cave/com.raytheon.uf.viz.monitor.scan/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
View file

@ -1,2 +0,0 @@
com.raytheon.uf.viz.monitor.scan.resource.ScanResourceData
com.raytheon.uf.viz.monitor.scan.resource.CWATLocalThreatResourceData

56
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDScanData.java
View file

@ -1,22 +1,24 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.monitor.scan.data;
/**
*
* DMDScanData
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Mar 25, 2010 4288 dhladky Initial creation
* </pre>
*
* @author dhladky
* @version 1.0
*
*/
import java.util.Date;
import java.util.HashMap;
import java.util.Set;
import java.util.TreeMap;
@ -24,9 +26,25 @@ import java.util.TreeMap;
import com.raytheon.uf.common.dataplugin.scan.data.DMDTableDataRow;
import com.raytheon.uf.common.dataplugin.scan.data.ScanTableData;
import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums;
import com.raytheon.uf.common.serialization.ISerializableObject;
public class DMDScanData implements ISerializableObject {
/**
*
* DMDScanData
*
* <pre>
* SOFTWARE HISTORY
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Mar 25, 2010 4288 dhladky Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author dhladky
* @version 1.0
*
*/
public class DMDScanData {
private HashMap<Long, ScanTableData<?>> data = null;

146
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/data/DMDTimeHeight.java
View file

@ -1,146 +0,0 @@
/**
* This software was developed and / or modified by Raytheon Company,
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
*
* U.S. EXPORT CONTROLLED TECHNICAL DATA
* This software product contains export-restricted data whose
* export/transfer/disclosure is restricted by U.S. law. Dissemination
* to non-U.S. persons whether in the United States or abroad requires
* an export license or other authorization.
*
* Contractor Name: Raytheon Company
* Contractor Address: 6825 Pine Street, Suite 340
* Mail Stop B8
* Omaha, NE 68106
* 402.291.0100
*
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
* further licensing information.
**/
package com.raytheon.uf.viz.monitor.scan.data;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* Contains the data used for the time-height graph.
*
* <pre>
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 10, 2010 lvenable Initial creation
*
* </pre>
*
* @author lvenable
* @version 1.0
*/
public class DMDTimeHeight implements ISerializableObject{
/**
* The ident of the data.
*/
private String ident;
/**
* Time offset in milliseconds.
*/
public Long offset;
/**
* Value.
*/
public Double value;
/**
* Height in kft.
*/
public Double height;
/**
* Low level diameter.
*/
public Double llDiam;
/**
* Constructor.
*/
public DMDTimeHeight() {
}
/**
* Get the time offset.
* @return The time offset.
*/
public Long getOffset() {
return offset;
}
/**
* Set the time offset.
* @param offset The time offset.
*/
public void setOffset(Long offset) {
this.offset = offset;
}
/**
* Get the value.
* @return The value.
*/
public Double getValue() {
return value;
}
/**
* Set the value.
* @param value The value.
*/
public void setValue(Double value) {
this.value = value;
}
/**
* Get the height in kft.
* @return Height in kft.
*/
public Double getHeight() {
return height;
}
/**
* Set the height in kft.
* @param height Height in kft.
*/
public void setHeight(Double height) {
this.height = height;
}
/**
*
* @return
*/
public Double getLlDiam() {
return llDiam;
}
public void setLlDiam(Double llDiam) {
this.llDiam = llDiam;
}
/**
* @param ident the ident to set
*/
public void setIdent(String ident) {
this.ident = ident;
}
/**
* @return the ident
*/
public String getIdent() {
return ident;
}
}

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanRunConfigXML.java
View file

@ -24,8 +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;
/**
* Scan Run Configuration accessor.
*
@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -45,7 +44,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "scanRunConfig")
@XmlAccessorType(XmlAccessType.NONE)
public class ScanRunConfigXML implements ISerializableObject {
public class ScanRunConfigXML {
@XmlElement(name="vcpList")
private ScanVcpListXML vcpList;

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanSampleConfigXML.java
View file

@ -24,8 +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;
/**
* SCAN Sample Configuration XML.
*
@ -33,9 +31,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 5, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 5, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -45,7 +44,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
@XmlRootElement(name = "ScanSampleConfig")
@XmlAccessorType(XmlAccessType.NONE)
public class ScanSampleConfigXML implements ISerializableObject {
public class ScanSampleConfigXML {
@XmlElement(name="cellSampleConfig", type=CellXML.class)
private CellXML cellSampleConfig;

12
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpListXML.java
View file

@ -26,8 +26,6 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* VCP List.
*
@ -35,18 +33,18 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
* @author mpduff
* @version 1.0
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ScanVcpListXML implements ISerializableObject {
public class ScanVcpListXML {
@XmlElements({ @XmlElement(name = "vcp", type = ScanVcpXML.class) })
private ArrayList<ScanVcpXML> vcpData;

11
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/xml/ScanVcpXML.java
View file

@ -23,8 +23,6 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
import com.raytheon.uf.common.serialization.ISerializableObject;
/**
* SCAN VCP Configuration
*
@ -32,9 +30,10 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*
* SOFTWARE HISTORY
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Date Ticket# Engineer Description
* ------------- -------- ----------- --------------------------
* Apr 20, 2011 mpduff Initial creation
* Oct 23, 2013 2491 bsteffen Remove ISerializableObject
*
* </pre>
*
@ -43,7 +42,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
*/
@XmlAccessorType(XmlAccessType.NONE)
public class ScanVcpXML implements ISerializableObject {
public class ScanVcpXML {
@XmlAttribute(name = "num")
private int number;