diff --git a/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject b/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject deleted file mode 100644 index 588bd6c7a3..0000000000 --- a/cave/com.raytheon.viz.grid/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject +++ /dev/null @@ -1,2 +0,0 @@ -com.raytheon.viz.grid.xml.ParameterList -com.raytheon.viz.grid.xml.ParameterMapping \ No newline at end of file diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarProductCodeMapping.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarProductCodeMapping.java index c793d6a922..d222e5a698 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarProductCodeMapping.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarProductCodeMapping.java @@ -29,13 +29,11 @@ import com.raytheon.uf.common.localization.IPathManager; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel; import com.raytheon.uf.common.localization.LocalizationContext.LocalizationType; import com.raytheon.uf.common.localization.PathManagerFactory; +import com.raytheon.uf.common.serialization.JAXBManager; import com.raytheon.uf.common.serialization.SerializationException; -import com.raytheon.uf.common.serialization.SerializationUtil; import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus.Priority; -import com.raytheon.uf.viz.core.status.StatusConstants; -import com.raytheon.viz.grid.Activator; import com.raytheon.viz.grid.xml.ParameterList; import com.raytheon.viz.grid.xml.ParameterMapping; @@ -48,6 +46,7 @@ import com.raytheon.viz.grid.xml.ParameterMapping; * Date Ticket# Engineer Description * ------------ ---------- ----------- -------------------------- * Mar 22, 2010 #4473 rjpeter Initial creation + * Nov 07, 2361 2361 njensen Use JAXBManager for XML * * * @@ -86,13 +85,14 @@ public class RadarProductCodeMapping { "/parameterMapping/radar/RadarProductCodes.xml"); try { - loadParameters(baseFile); + JAXBManager jaxb = new JAXBManager(ParameterList.class); + loadParameters(baseFile, jaxb); if (siteFile.exists()) { - loadParameters(siteFile); + loadParameters(siteFile, jaxb); } if (userFile.exists()) { - loadParameters(userFile); + loadParameters(userFile, jaxb); } } catch (Exception e) { statusHandler.handle( @@ -102,9 +102,10 @@ public class RadarProductCodeMapping { } } - private void loadParameters(File fileToLoad) throws SerializationException { - ParameterList parameterList = (ParameterList) SerializationUtil - .jaxbUnmarshalFromXmlFile(fileToLoad); + private void loadParameters(File fileToLoad, JAXBManager jaxb) + throws SerializationException { + ParameterList parameterList = jaxb.unmarshalFromXmlFile( + ParameterList.class, fileToLoad); for (ParameterMapping parameter : parameterList.getParameters()) { // print message for overwrite? parameterMappings.put(parameter.getAbbrev(), diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterList.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterList.java index f3174c8da0..3e7990a7bc 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterList.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterList.java @@ -26,10 +26,8 @@ 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; - /** - * TODO Add Description + * List of ParameterMappings * *
  * 
@@ -37,6 +35,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 22, 2010 #4473      rjpeter     Initial creation
+ * Nov 07, 2013  2361      njensen     Remove ISerializableObject
  * 
  * 
* @@ -45,7 +44,8 @@ import com.raytheon.uf.common.serialization.ISerializableObject; */ @XmlRootElement(name = "parameterList") @XmlAccessorType(XmlAccessType.NONE) -public class ParameterList implements ISerializableObject { +public class ParameterList { + @XmlElement(name = "parameter") private List parameters; diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterMapping.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterMapping.java index 1de0bb26c5..ee45b3ebba 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterMapping.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterMapping.java @@ -25,10 +25,8 @@ 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; - /** - * TODO Add Description + * Grid parameter name to map various radar product codes * *
  * 
@@ -36,6 +34,7 @@ import com.raytheon.uf.common.serialization.ISerializableObject;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Mar 22, 2010 #4473      rjpeter     Initial creation
+ * Nov 07, 2013  2361      njensen     Remove ISerializableObject
  * 
  * 
* @@ -43,7 +42,8 @@ import com.raytheon.uf.common.serialization.ISerializableObject; * @version 1.0 */ @XmlAccessorType(XmlAccessType.NONE) -public class ParameterMapping implements ISerializableObject { +public class ParameterMapping { + @XmlAttribute private String abbrev;