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

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index 88a3d87..eb2f9a6 100644
--- a/tim/prune/load/xml/ZipFileLoader.java
+++ b/tim/prune/load/xml/ZipFileLoader.java
@@ -11,7 +11,6 @@ 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;
 
@@ -57,8 +56,8 @@ 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");
@@ -69,7 +68,7 @@ public class ZipFileLoader
 							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, handler.getTrackNameList(),
+								null, sourceInfo, handler.getTrackNameList(),
 								new MediaLinkInfo(inFile, handler.getLinkArray()));
 							xmlFound = true;
 						}
@@ -83,7 +82,7 @@ public class ZipFileLoader
 			}
 		}
 		catch (Exception e) {
-			System.err.println("ZipFile Error: " + e.getClass().getName() + " -message= " + e.getMessage());
+			_app.showErrorMessageNoLookup("error.load.dialogtitle", e.getClass().getName() + "\n - " + e.getMessage());
 		}
 	}
 
@@ -117,7 +116,7 @@ public class ZipFileLoader
 						{
 							// 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;
 						}