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

Issue #2361 fix iscUtil

Browse source 
Change-Id: I4f62e048db3c1b453f56ece98448e1cf8b35fc28

Former-commit-id: fa2a7db710 [formerly 8aecb21306] [formerly dc60f94a34 [formerly 93ec0db0ac9adeab663fa18f2d93eb9a42e4302b]]
Former-commit-id: dc60f94a34
Former-commit-id: ef92804824
This commit is contained in:
Nate Jensen 2013-10-10 17:38:01 -05:00
parent 93b93a6750
commit a75c66778b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
View file

@ -28,10 +28,10 @@ from time import gmtime,strftime
from java.io import File from java.io import File
from com.raytheon.uf.common.time import TimeRange 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.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.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 IFPServerConfig
from com.raytheon.edex.plugin.gfe.config import IFPServerConfigManager 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 LocalizationFile
from com.raytheon.uf.common.localization import PathManagerFactory from com.raytheon.uf.common.localization import PathManagerFactory
from com.raytheon.uf.common.localization import LocalizationContext from com.raytheon.uf.common.localization import LocalizationContext
@ -70,7 +70,7 @@ def getEditArea(name, siteID):
try: try:
if os.path.exists(file.getPath()): if os.path.exists(file.getPath()):
refData = SerializationUtil.jaxbUnmarshalFromXmlFile(file.getPath()); refData = ReferenceData.getJAXBManager().unmarshalFromXmlFile(file.getPath());
else: else:
LogStream.logProblem("EDIT AREA NOT FOUND: ",name," for site ",siteID) LogStream.logProblem("EDIT AREA NOT FOUND: ",name," for site ",siteID)
except: except:
@ -86,7 +86,7 @@ def saveEditAreaGrid(maskName, iscMask, siteID):
commonStaticConfig.setContextName(siteID) commonStaticConfig.setContextName(siteID)
sitePath = pathMgr.getFile(commonStaticConfig,"gfe/editAreas").getPath() sitePath = pathMgr.getFile(commonStaticConfig,"gfe/editAreas").getPath()
editAreaPath = str(sitePath) + "/" + maskName + ".xml" editAreaPath = str(sitePath) + "/" + maskName + ".xml"
SerializationUtil.jaxbMarshalToXmlFile(iscMask, editAreaPath) ReferenceData.getJAXBManager().marshalToXmlFile(iscMask, editAreaPath)
def deleteEditArea(name, siteID): def deleteEditArea(name, siteID):
pathMgr = PathManagerFactory.getPathManager() pathMgr = PathManagerFactory.getPathManager()