From dc60f94a342b0f52d1f56d1f5b6af6c33888ea69 Mon Sep 17 00:00:00 2001 From: Nate Jensen Date: Thu, 10 Oct 2013 17:38:01 -0500 Subject: [PATCH] Issue #2361 fix iscUtil Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28 Former-commit-id: 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b --- .../utility/edex_static/base/gfe/isc/iscUtil.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py index 7ada937cfa..20cdd2b758 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py @@ -28,10 +28,10 @@ from time import gmtime,strftime from java.io import File from com.raytheon.uf.common.time import TimeRange from com.raytheon.uf.common.dataplugin.gfe.db.objects import GridLocation +from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceData from com.raytheon.uf.common.dataplugin.gfe.reference import ReferenceData_CoordinateType as CoordinateType from com.raytheon.edex.plugin.gfe.config import IFPServerConfig from com.raytheon.edex.plugin.gfe.config import IFPServerConfigManager -from com.raytheon.uf.common.serialization import SerializationUtil from com.raytheon.uf.common.localization import LocalizationFile from com.raytheon.uf.common.localization import PathManagerFactory from com.raytheon.uf.common.localization import LocalizationContext @@ -70,7 +70,7 @@ def getEditArea(name, siteID): try: if os.path.exists(file.getPath()): - refData = SerializationUtil.jaxbUnmarshalFromXmlFile(file.getPath()); + refData = ReferenceData.getJAXBManager().unmarshalFromXmlFile(file.getPath()); else: LogStream.logProblem("EDIT AREA NOT FOUND: ",name," for site ",siteID) except: @@ -86,7 +86,7 @@ def saveEditAreaGrid(maskName, iscMask, siteID): commonStaticConfig.setContextName(siteID) sitePath = pathMgr.getFile(commonStaticConfig,"gfe/editAreas").getPath() editAreaPath = str(sitePath) + "/" + maskName + ".xml" - SerializationUtil.jaxbMarshalToXmlFile(iscMask, editAreaPath) + ReferenceData.getJAXBManager().marshalToXmlFile(iscMask, editAreaPath) def deleteEditArea(name, siteID): pathMgr = PathManagerFactory.getPathManager()