Version 13, August 2011

[GpsPrune.git] / tim / prune / load / xml / ZipFileLoader.java

diff --git a/tim/prune/load/xml/ZipFileLoader.java b/tim/prune/load/xml/ZipFileLoader.java
index dfeec526cb0ddfe190d76621cf7ac1747ea41130..88a3d87706943ad1a5ad17b8d3fbe913e35d3ba9 100644 (file)
--- 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("Error: " + e.getClass().getName() + " -message= " + e.getMessage());
+                       System.err.println("ZipFile Error: " + e.getClass().getName() + " -message= " + 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;
                                                }
                                        }
@@ -125,7 +130,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());
                }
        }
 }