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

Issue #2361 fix scan alarm dialog

Browse source 
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426

Former-commit-id: 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]
Former-commit-id: 81fd87d9dd
This commit is contained in:
Nate Jensen 2013-10-17 13:55:19 -05:00
parent d72a7f3c69
commit 4cd95b545b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/commondialogs/SCANAlarmTimeLimitDlg.java
View file

@ -41,7 +41,7 @@ import com.raytheon.uf.common.localization.LocalizationFile;
import com.raytheon.uf.common.localization.PathManagerFactory; import com.raytheon.uf.common.localization.PathManagerFactory;
import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables; import com.raytheon.uf.common.monitor.scan.config.SCANConfigEnums.ScanTables;
import com.raytheon.uf.common.monitor.scan.xml.ScanAlarmXML; import com.raytheon.uf.common.monitor.scan.xml.ScanAlarmXML;
import com.raytheon.uf.common.serialization.SerializationUtil; import com.raytheon.uf.common.serialization.SingleTypeJAXBManager;
import com.raytheon.uf.common.status.IUFStatusHandler; import com.raytheon.uf.common.status.IUFStatusHandler;
import com.raytheon.uf.common.status.UFStatus; import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority; import com.raytheon.uf.common.status.UFStatus.Priority;
@ -59,6 +59,8 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Nov 22, 2010 lvenable Initial creation * Nov 22, 2010 lvenable Initial creation
* 24 Jul 2013 #2143 skorolev Changes for non-blocking dialogs. * 24 Jul 2013 #2143 skorolev Changes for non-blocking dialogs.
* Aug 15, 2013 2143 mpduff Remove resize. * Aug 15, 2013 2143 mpduff Remove resize.
* Oct 17, 2013 2361 njensen Use JAXBManager for XML
*
* </pre> * </pre>
* *
* @author lvenable * @author lvenable
@ -66,6 +68,10 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
*/ */
public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
ICommonDialogAction { ICommonDialogAction {
private static final SingleTypeJAXBManager<ScanAlarmXML> jaxb = SingleTypeJAXBManager
.createWithoutException(ScanAlarmXML.class);
private final IUFStatusHandler statusHandler = UFStatus private final IUFStatusHandler statusHandler = UFStatus
.getHandler(SCANAlarmTimeLimitDlg.class); .getHandler(SCANAlarmTimeLimitDlg.class);
@ -342,8 +348,7 @@ public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
String path = pm.getStaticFile(getFullPathAndFileName()) String path = pm.getStaticFile(getFullPathAndFileName())
.getAbsolutePath(); .getAbsolutePath();
dataXML = SerializationUtil.jaxbUnmarshalFromXmlFile( dataXML = jaxb.unmarshalFromXmlFile(path);
ScanAlarmXML.class, path);
} catch (Exception e) { } catch (Exception e) {
statusHandler.handle(Priority.PROBLEM, statusHandler.handle(Priority.PROBLEM,
"Scan Alarms not available (ScanAlarms.xml).", e); "Scan Alarms not available (ScanAlarms.xml).", e);
@ -379,8 +384,7 @@ public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
} }
try { try {
SerializationUtil.jaxbMarshalToXmlFile(dataXML, locFile.getFile() jaxb.marshalToXmlFile(dataXML, locFile.getFile().getAbsolutePath());
.getAbsolutePath());
locFile.save(); locFile.save();
} catch (Exception e) { } catch (Exception e) {
statusHandler.handle(Priority.ERROR, statusHandler.handle(Priority.ERROR,