X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2Fxml%2FZipFileLoader.java;h=74e48f9497c6ab387dd779b2a97747511e320a85;hb=7f5ed2be62905bd37717376dc22d09e5ea7edb4d;hp=df60576a057617eccae0652889afe6ce2b6ad2d8;hpb=140e9d165f85c3d4f0435a311e091209313faa2a;p=GpsPrune.git

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index df60576..74e48f9 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
@@ -62,12 +62,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, handler.getTrackNameList());
+								null, sourceInfo, handler.getTrackNameList(),
+								new MediaLinkInfo(inFile, handler.getLinkArray()));
 							xmlFound = true;
 						}
 					}
@@ -80,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());
 		}
 	}
 
@@ -110,10 +112,11 @@ 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;
 						}