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

Merge "Omaha #3548 PluginDataObjectFilter fails to start in spring" into omaha_14.4.1

Browse source 
Former-commit-id: 4a1d15b667 [formerly 7a57781b2a] [formerly 98ba45f4e77cf90f43e178a5fb546959c8132af1 [formerly 7d664adaf2]] [formerly af1052ccf6 [formerly 7d664adaf2 [formerly b70bcdf470e20eed85352e14939f13cbeb91b49b]]]
Former-commit-id: af1052ccf6
Former-commit-id: 0739e0d3825203c1dcdac5088bbc36a95526b65d [formerly 2d9130b0f4]
Former-commit-id: 9dac021eec
This commit is contained in:
Nate Jensen 2014-09-11 11:11:30 -05:00 • committed by Gerrit Code Review
commit 8a48a0b1f2
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.AbstractFilterElement;
import com.raytheon.uf.edex.decodertools.core.filterimpl.AbstractObsFilter; 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.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 * Use information in metarToShefFilter.xml, MetarToShefFilter filters out the
@ -116,7 +120,11 @@ public class MetarToShefFilter {
stream.close(); stream.close();
JAXBManager jaxb = new JAXBManager( JAXBManager jaxb = new JAXBManager(
PluginDataObjectFilter.class, PluginDataObjectFilter.class,
MetarToShefFilter.class); MetarToShefFilter.class,
RadiusFilterElement.class,
RectFilterElement.class,
StationIdFilterElement.class,
WMOHeaderFilterElement.class);
Object obj = jaxb.unmarshalFromXml(new String(data)); Object obj = jaxb.unmarshalFromXml(new String(data));
if (obj instanceof PluginDataObjectFilter) { if (obj instanceof PluginDataObjectFilter) {
logger.info("Found " + filterConfigFile 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.LocalizationContext.LocalizationLevel;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.pointdata.spatial.SurfaceObsLocation; 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; 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 * Aug 30, 2013 2298 rjpeter Make getPluginName abstract
* Jun 11, 2014 2061 bsteffen Remove IDecoderGettable * Jun 11, 2014 2061 bsteffen Remove IDecoderGettable
* Jul 23, 2014 3410 bclement location changed to floats * 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 09, 2014 3548 mapeters Improved constructor's error messages.
* Sep 11, 2014 3548 mapeters Replaced use of SerializationUtil
* with JAXBManager.
* *
* </pre> * </pre>
* *
@ -95,10 +95,15 @@ public class PluginDataObjectFilter extends AbstractObsFilter {
filterDir = manager.getFile(context, FILTERS_DIR); filterDir = manager.getFile(context, FILTERS_DIR);
if (filterDir.exists()) { if (filterDir.exists()) {
File srcFile = new File(filterDir, filterConfigFile); File srcFile = new File(filterDir, filterConfigFile);
SingleTypeJAXBManager<PluginDataObjectFilter> jaxb = new SingleTypeJAXBManager<PluginDataObjectFilter>( JAXBManager jaxb = new JAXBManager(
PluginDataObjectFilter.class); PluginDataObjectFilter.class,
RadiusFilterElement.class,
RectFilterElement.class,
StationIdFilterElement.class,
WMOHeaderFilterElement.class);
PluginDataObjectFilter filter = jaxb PluginDataObjectFilter filter = jaxb
.unmarshalFromXmlFile(srcFile); .unmarshalFromXmlFile(
PluginDataObjectFilter.class, srcFile);
setFilterElements(filter.getFilterElements()); setFilterElements(filter.getFilterElements());
setFilterName(filter.getFilterName()); setFilterName(filter.getFilterName());