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

Merge "Issue #2361 fix scan alarm dialog" into development

Browse source 
Former-commit-id: e830c9832a [formerly b2629b9d22] [formerly 4c1a3fbd1e] [formerly 4c1a3fbd1e [formerly 3a8650ef28]] [formerly 532d9f1bbe [formerly 4c1a3fbd1e [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: 5bbd06fd9c210e8ce4db97ae1ce32253039dbadf [formerly f2c56097835e64f08a5d48331e7d3b30ef221a5d] [formerly 32ecd61eae [formerly 64fdaa70d7]]
Former-commit-id: 32ecd61eae
Former-commit-id: 9dd39289ef
This commit is contained in:
Nate Jensen 2013-10-17 14:20:52 -05:00 • committed by Gerrit Code Review
commit 2a1876ecdb
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.monitor.scan.config.SCANConfigEnums.ScanTables;
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.UFStatus;
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
* 24 Jul 2013 #2143 skorolev Changes for non-blocking dialogs.
* Aug 15, 2013 2143 mpduff Remove resize.
* Oct 17, 2013 2361 njensen Use JAXBManager for XML
*
* </pre>
*
* @author lvenable
@ -66,6 +68,10 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
*/
public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
ICommonDialogAction {
private static final SingleTypeJAXBManager<ScanAlarmXML> jaxb = SingleTypeJAXBManager
.createWithoutException(ScanAlarmXML.class);
private final IUFStatusHandler statusHandler = UFStatus
.getHandler(SCANAlarmTimeLimitDlg.class);
@ -342,8 +348,7 @@ public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
String path = pm.getStaticFile(getFullPathAndFileName())
.getAbsolutePath();
dataXML = SerializationUtil.jaxbUnmarshalFromXmlFile(
ScanAlarmXML.class, path);
dataXML = jaxb.unmarshalFromXmlFile(path);
} catch (Exception e) {
statusHandler.handle(Priority.PROBLEM,
"Scan Alarms not available (ScanAlarms.xml).", e);
@ -379,8 +384,7 @@ public class SCANAlarmTimeLimitDlg extends CaveSWTDialog implements
}
try {
SerializationUtil.jaxbMarshalToXmlFile(dataXML, locFile.getFile()
.getAbsolutePath());
jaxb.marshalToXmlFile(dataXML, locFile.getFile().getAbsolutePath());
locFile.save();
} catch (Exception e) {
statusHandler.handle(Priority.ERROR,