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

Omaha #4512 Check for redbookMapping.xml in common_static.configured, then cave_static.base

Browse source 
Change-Id: I759571640d72ec72fc76afcccd20314dc106f559

Former-commit-id: d6f42a6947d49170ace6654f30ab93a5cba57d1c
This commit is contained in:
Mark Peters 2015-07-21 13:23:39 -05:00
parent 44d41e6253
commit 32b5f874cf
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
edexOsgi/com.raytheon.uf.common.dataplugin.redbook/src/com/raytheon/uf/common/dataplugin/redbook/RedbookWMOMap.java
View file

@ -19,7 +19,6 @@
**/ **/
package com.raytheon.uf.common.dataplugin.redbook; package com.raytheon.uf.common.dataplugin.redbook;
import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import javax.xml.bind.JAXB; import javax.xml.bind.JAXB;
@ -28,6 +27,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import com.raytheon.uf.common.localization.IPathManager;
import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
/** /**
@ -41,6 +43,8 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
* Nov 04, 2013 2361 njensen Use JAXB instead of SerializationUtil * Nov 04, 2013 2361 njensen Use JAXB instead of SerializationUtil
* Jun 25, 2015 4512 mapeters Refactored from viz.redbook, made mapping * Jun 25, 2015 4512 mapeters Refactored from viz.redbook, made mapping
* private, added getValue() and addEntry() * private, added getValue() and addEntry()
* Jul 21, 2015 4512 mapeters Check for redbookMapping.xml in common_static.configured,
* then cave_static.base
* *
* </pre> * </pre>
* *
@ -51,6 +55,9 @@ import com.raytheon.uf.common.localization.PathManagerFactory;
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public class RedbookWMOMap { public class RedbookWMOMap {
private static final String FILE_PATH = "redbook" + IPathManager.SEPARATOR
+ "redbookMapping.xml";
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
public static class Info { public static class Info {
public String name; public String name;
@ -70,9 +77,26 @@ public class RedbookWMOMap {
} }
public static RedbookWMOMap load() { public static RedbookWMOMap load() {
File file = PathManagerFactory.getPathManager().getStaticFile( IPathManager pathMgr = PathManagerFactory.getPathManager();
"redbook/redbookMapping.xml"); /*
RedbookWMOMap map = JAXB.unmarshal(file, RedbookWMOMap.class); * Check common_static.configured first, as it is now being saved there.
* If not found, check cave_static.base, where it used to be stored (in
* the future cave_static should no longer need to be checked).
*/
LocalizationContext context = pathMgr.getContext(
LocalizationContext.LocalizationType.COMMON_STATIC,
LocalizationContext.LocalizationLevel.CONFIGURED);
LocalizationFile locFile = pathMgr.getLocalizationFile(context,
FILE_PATH);
if (locFile == null || !locFile.exists()) {
context = pathMgr.getContext(
LocalizationContext.LocalizationType.CAVE_STATIC,
LocalizationContext.LocalizationLevel.BASE);
locFile = pathMgr.getLocalizationFile(context, FILE_PATH);
}
RedbookWMOMap map = JAXB.unmarshal(locFile.getFile(),
RedbookWMOMap.class);
// add ability for comma separated values in xml file // add ability for comma separated values in xml file
RedbookWMOMap secondMap = new RedbookWMOMap(); RedbookWMOMap secondMap = new RedbookWMOMap();