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

Omaha #3548 PluginDataObjectFilter fails to start in spring

Browse source 
Change-Id: I6db18d15b5a35a081de48a885e3d27495b44b5d0

Former-commit-id: fb33786001 [formerly e9d50c287b6327ea03437a98fb1077b904daeecd]
Former-commit-id: d671d1f432
This commit is contained in:
Mark Peters 2014-09-11 10:32:11 -05:00
parent bec987b601
commit cbb5715b34
2 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/transform/shef/MetarToShefFilter.java
View file

@ -49,6 +49,10 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractFilterElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractObsFilter;
import com.raytheon.uf.edex.decodertools.core.filterimpl.PluginDataObjectFilter;
import com.raytheon.uf.edex.decodertools.core.filterimpl.RadiusFilterElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.RectFilterElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.StationIdFilterElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.WMOHeaderFilterElement;
/**
* Use information in metarToShefFilter.xml, MetarToShefFilter filters out the
@ -116,7 +120,11 @@ public class MetarToShefFilter {
stream.close();
JAXBManager jaxb = new JAXBManager(
PluginDataObjectFilter.class,
MetarToShefFilter.class);
MetarToShefFilter.class,
RadiusFilterElement.class,
RectFilterElement.class,
StationIdFilterElement.class,
WMOHeaderFilterElement.class);
Object obj = jaxb.unmarshalFromXml(new String(data));
if (obj instanceof PluginDataObjectFilter) {
logger.info("Found " + filterConfigFile

17
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/core/filterimpl/PluginDataObjectFilter.java
View file

@ -40,7 +40,7 @@ import com.raytheon.uf.common.localization.LocalizationContext;
import com.raytheon.uf.common.localization.LocalizationContext.LocalizationLevel;
import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation;
import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
import com.raytheon.uf.common.serialization.JAXBManager;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
/**
@ -55,9 +55,9 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
* Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Jun 11, 2014 2061 bsteffen Remove IDecoderGettable
* Jul 23, 2014 3410 bclement location changed to floats
* Aug 28, 2014 3548 mapeters Replaced use of SerializationUtil
* with SingleTypeJAXBManager
* Sep 09, 2014 3548 mapeters Improved constructor's error messages.
* Sep 11, 2014 3548 mapeters Replaced use of SerializationUtil
* with JAXBManager.
*
* </pre>
*
@ -95,10 +95,15 @@ public class PluginDataObjectFilter extends AbstractObsFilter {
filterDir = manager.getFile(context, FILTERS_DIR);
if (filterDir.exists()) {
File srcFile = new File(filterDir, filterConfigFile);
SingleTypeJAXBManager<PluginDataObjectFilter> jaxb = new SingleTypeJAXBManager<PluginDataObjectFilter>(
PluginDataObjectFilter.class);
JAXBManager jaxb = new JAXBManager(
PluginDataObjectFilter.class,
RadiusFilterElement.class,
RectFilterElement.class,
StationIdFilterElement.class,
WMOHeaderFilterElement.class);
PluginDataObjectFilter filter = jaxb
.unmarshalFromXmlFile(srcFile);
.unmarshalFromXmlFile(
PluginDataObjectFilter.class, srcFile);
setFilterElements(filter.getFilterElements());
setFilterName(filter.getFilterName());