X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FXmlFileLoader.java;h=d528420029a325f8cfc33238de6c80b5c55ef8cc;hb=6814c830d470f73c7ec57c71235de333f5ea4279;hp=8801d00e08f6db1083a7617b9e9f74106f0e0f69;hpb=52bf9e8686c916be37a26a0b75340393d4478b05;p=GpsPrune.git

diff --git a/tim/prune/load/xml/XmlFileLoader.java b/tim/prune/load/xml/XmlFileLoader.java
index 8801d00..d528420 100644
--- a/tim/prune/load/xml/XmlFileLoader.java
+++ b/tim/prune/load/xml/XmlFileLoader.java
@@ -1,8 +1,8 @@
 package tim.prune.load.xml;
 
 import java.io.File;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
+import java.io.FileInputStream;
+
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
@@ -12,6 +12,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 +22,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 +29,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();
 	}
@@ -58,33 +63,40 @@ public class XmlFileLoader extends DefaultHandler implements Runnable
 	 */
 	public void run()
 	{
+		FileInputStream inStream = null;
 		try
 		{
 			// Construct a SAXParser and use this as a default handler
 			SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-			saxParser.parse(_file, this);
+			inStream = new FileInputStream(_file);
+			saxParser.parse(inStream, this);
 
 			// Check whether handler was properly instantiated
 			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, _handler.getTrackNameList());
 			}
 		}
 		catch (Exception e)
 		{
+			// clean up file stream
+			try {
+				inStream.close();
+			}
+			catch (Exception e2) {}
 			// 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 +113,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;
 			}