X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FXmlFileLoader.java;h=7fa5ec1b80f8b1d693686dacb1cd2483709b1f89;hb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;hp=987841e6935cc4c680a34d5b7db2ac3c24dd8fe5;hpb=da0b1f449260a0b4a94318006382a9039726ef3e;p=GpsPrune.git diff --git a/tim/prune/load/xml/XmlFileLoader.java b/tim/prune/load/xml/XmlFileLoader.java index 987841e..7fa5ec1 100644 --- a/tim/prune/load/xml/XmlFileLoader.java +++ b/tim/prune/load/xml/XmlFileLoader.java @@ -1,8 +1,6 @@ package tim.prune.load.xml; import java.io.File; -import javax.swing.JFrame; -import javax.swing.JOptionPane; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -12,6 +10,7 @@ import org.xml.sax.helpers.DefaultHandler; import tim.prune.App; import tim.prune.I18nManager; import tim.prune.data.Altitude; +import tim.prune.data.SourceInfo; /** * Class for handling loading of Xml files, and passing the @@ -21,7 +20,6 @@ public class XmlFileLoader extends DefaultHandler implements Runnable { private File _file = null; private App _app = null; - private JFrame _parentFrame = null; private XmlHandler _handler = null; private String _unknownType = null; @@ -29,24 +27,29 @@ public class XmlFileLoader extends DefaultHandler implements Runnable /** * Constructor * @param inApp Application object to inform of track load - * @param inParentFrame parent frame to reference for dialogs */ - public XmlFileLoader(App inApp, JFrame inParentFrame) + public XmlFileLoader(App inApp) { _app = inApp; - _parentFrame = inParentFrame; } + /** + * Reset the handler to ensure data cleared + */ + public void reset() + { + _handler = null; + _unknownType = null; + } /** - * Open the selected file and show the GUI dialog to select load options + * Open the selected file * @param inFile File to open */ public void openFile(File inFile) { _file = inFile; - _handler = null; - _unknownType = null; + reset(); // start new thread in case xml parsing is time-consuming new Thread(this).start(); } @@ -68,23 +71,23 @@ public class XmlFileLoader extends DefaultHandler implements Runnable if (_handler == null) { // Wasn't either kml or gpx - JOptionPane.showMessageDialog(_parentFrame, - I18nManager.getText("error.load.unknownxml") + " " + _unknownType, - I18nManager.getText("error.load.dialogtitle"), JOptionPane.ERROR_MESSAGE); + _app.showErrorMessageNoLookup("error.load.dialogtitle", + I18nManager.getText("error.load.unknownxml") + " " + _unknownType); } else { // Pass information back to app + SourceInfo sourceInfo = new SourceInfo(_file, + (_handler instanceof GpxHandler?SourceInfo.FILE_TYPE.GPX:SourceInfo.FILE_TYPE.KML)); _app.informDataLoaded(_handler.getFieldArray(), _handler.getDataArray(), - Altitude.FORMAT_METRES, _file.getName()); + Altitude.Format.METRES, sourceInfo); } } catch (Exception e) { // Show error dialog - JOptionPane.showMessageDialog(_parentFrame, - I18nManager.getText("error.load.othererror") + " " + e.getMessage(), - I18nManager.getText("error.load.dialogtitle"), JOptionPane.ERROR_MESSAGE); + _app.showErrorMessageNoLookup("error.load.dialogtitle", + I18nManager.getText("error.load.othererror") + " " + e.getMessage()); } } @@ -101,7 +104,7 @@ public class XmlFileLoader extends DefaultHandler implements Runnable { if (qName.equals("kml")) {_handler = new KmlHandler();} else if (qName.equals("gpx")) {_handler = new GpxHandler();} - else if (_unknownType == null && qName != null && !qName.equals("")) + else if (_unknownType == null && !qName.equals("")) { _unknownType = qName; } @@ -145,4 +148,12 @@ public class XmlFileLoader extends DefaultHandler implements Runnable } super.endElement(uri, localName, qName); } + + /** + * @return The Xml handler used for the parsing + */ + public XmlHandler getHandler() + { + return _handler; + } }