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

Merge "Issue #2361 remove viz.grid ISerializableObjects" into development

Browse source 
Former-commit-id: 214a72ac69 [formerly 214a72ac69 [formerly a227c2dcb2598f82756c3f6a9ac7999c06202177]]
Former-commit-id: bb0dcf6d4a
Former-commit-id: 1909b0d06b
This commit is contained in:
Richard Peter 2013-11-08 10:35:41 -06:00 • committed by Gerrit Code Review
commit 7725d0ee3e
4 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,2 +0,0 @@
com.raytheon.viz.grid.xml.ParameterList
com.raytheon.viz.grid.xml.ParameterMapping

19
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/RadarProductCodeMapping.java
View file

@ -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
*
* </pre>
*
@ -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(),

8
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterList.java
View file

@ -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
*
* <pre>
*
@ -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
*
* </pre>
*
@ -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<ParameterMapping> parameters;

8
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/xml/ParameterMapping.java
View file

@ -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
*
* <pre>
*
@ -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
*
* </pre>
*
@ -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;