X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FZipFileLoader.java;h=eb2f9a604d3aefd2fabcb9ad33f73ec2004dde28;hb=326f489e36aa7f235bc19409a57bf4955cd50f24;hp=dfeec526cb0ddfe190d76621cf7ac1747ea41130;hpb=1ee49ae3c8ef3aa2e63eadd458531e5f8bd4f92c;p=GpsPrune.git

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index dfeec52..eb2f9a6 100644
--- a/tim/prune/load/xml/ZipFileLoader.java
+++ b/tim/prune/load/xml/ZipFileLoader.java
@@ -11,8 +11,8 @@ import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
 import tim.prune.App;
-import tim.prune.data.Altitude;
 import tim.prune.data.SourceInfo;
+import tim.prune.load.MediaLinkInfo;
 
 /**
  * Class to handle the loading of zipped xml files
@@ -22,7 +22,7 @@ public class ZipFileLoader
 	/** App for callback of file loading */
 	private App _app = null;
 	/** Object to do the handling of the xml */
-	XmlFileLoader _xmlLoader = null;
+	private XmlFileLoader _xmlLoader = null;
 
 	/**
 	 * Constructor
@@ -56,18 +56,20 @@ public class ZipFileLoader
 					if (suffix.equals(".kml") || suffix.equals(".gpx") || suffix.equals(".xml"))
 					{
 						_xmlLoader.reset();
-						SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser();
-						saxParser.parse(file.getInputStream(entry), _xmlLoader);
+						// Parse the stream using either Xerces or java classes
+						_xmlLoader.parseXmlStream(file.getInputStream(entry));
 						XmlHandler handler = _xmlLoader.getHandler();
 						if (handler == null) {
 							_app.showErrorMessage("error.load.dialogtitle", "error.load.othererror");
 						}
-						else {
+						else
+						{
 							// Send back to app
 							SourceInfo sourceInfo = new SourceInfo(inFile,
 								(handler instanceof GpxHandler?SourceInfo.FILE_TYPE.GPX:SourceInfo.FILE_TYPE.KML));
 							_app.informDataLoaded(handler.getFieldArray(), handler.getDataArray(),
-								Altitude.Format.METRES, sourceInfo);
+								null, sourceInfo, handler.getTrackNameList(),
+								new MediaLinkInfo(inFile, handler.getLinkArray()));
 							xmlFound = true;
 						}
 					}
@@ -80,7 +82,7 @@ public class ZipFileLoader
 			}
 		}
 		catch (Exception e) {
-			System.err.println("Error: " + e.getClass().getName() + " -message= " + e.getMessage());
+			_app.showErrorMessageNoLookup("error.load.dialogtitle", e.getClass().getName() + "\n - " + e.getMessage());
 		}
 	}
 
@@ -110,10 +112,12 @@ public class ZipFileLoader
 						if (handler == null) {
 							_app.showErrorMessage("error.load.dialogtitle", "error.load.othererror");
 						}
-						else {
+						else
+						{
 							// Send back to app
 							_app.informDataLoaded(handler.getFieldArray(), handler.getDataArray(),
-								Altitude.Format.METRES, new SourceInfo("gpsies", SourceInfo.FILE_TYPE.GPSIES));
+								new SourceInfo("gpsies", SourceInfo.FILE_TYPE.GPSIES),
+								handler.getTrackNameList());
 							xmlFound = true;
 						}
 					}
@@ -125,7 +129,7 @@ public class ZipFileLoader
 			}
 		}
 		catch (Exception e) {
-			System.err.println("Error: " + e.getClass().getName() + " -message= " + e.getMessage());
+			System.err.println("ZipStream Error: " + e.getClass().getName() + " -message= " + e.getMessage());
 		}
 	}
 }