X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FZipFileLoader.java;h=fff0d92aa67f1587aa6e311411bc1f43caecd293;hb=f1b92378a792131ac8fb33a869405851d5b2d1f7;hp=2d0f1693226cced1a8dd8aafd057d32fd506e936;hpb=c0387c124840c9407e040600fda88f3c3e8f6aa6;p=GpsPrune.git

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index 2d0f169..fff0d92 100644
--- a/tim/prune/load/xml/ZipFileLoader.java
+++ b/tim/prune/load/xml/ZipFileLoader.java
@@ -13,6 +13,7 @@ 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 +23,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
@@ -62,12 +63,14 @@ public class ZipFileLoader
 						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);
+								Altitude.Format.METRES, sourceInfo, handler.getTrackNameList(),
+								new MediaLinkInfo(inFile, handler.getLinkArray()));
 							xmlFound = true;
 						}
 					}
@@ -80,7 +83,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());
 		}
 	}
 
@@ -110,10 +113,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));
+								Altitude.Format.METRES, new SourceInfo("gpsies", SourceInfo.FILE_TYPE.GPSIES),
+								handler.getTrackNameList());
 							xmlFound = true;
 						}
 					}