Version 15, March 2013

[GpsPrune.git] / tim / prune / load / FileLoader.java

diff --git a/tim/prune/load/FileLoader.java b/tim/prune/load/FileLoader.java
index c6d9827921ffa9a4d64f401411fa670b8134a2e6..8669e189c94043b4e3ab91889c4acf4b5e52dc0e 100644 (file)
--- a/tim/prune/load/FileLoader.java
+++ b/tim/prune/load/FileLoader.java
@@ -2,11 +2,14 @@ package tim.prune.load;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.TreeSet;
+
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 
 import tim.prune.App;
 import tim.prune.config.Config;
+import tim.prune.data.Photo;
 import tim.prune.load.xml.GzipFileLoader;
 import tim.prune.load.xml.XmlFileLoader;
 import tim.prune.load.xml.ZipFileLoader;
@@ -107,8 +110,9 @@ public class FileLoader
                }
                // Check file type to see if it's xml or just normal text
                String fileExtension = inFile.getName().toLowerCase();
-               if (fileExtension.length() > 4)
-                       {fileExtension = fileExtension.substring(fileExtension.length() - 4);}
+               if (fileExtension.length() > 4) {
+                       fileExtension = fileExtension.substring(fileExtension.length() - 4);
+               }
                if (fileExtension.equals(".kml") || fileExtension.equals(".gpx")
                        || fileExtension.equals(".xml"))
                {
@@ -129,6 +133,14 @@ public class FileLoader
                {
                        _nmeaFileLoader.openFile(inFile);
                }
+               else if (fileExtension.equals(".jpg") || fileExtension.equals("jpeg"))
+               {
+                       Photo photo = JpegLoader.createPhoto(inFile);
+                       TreeSet<Photo> photoSet = new TreeSet<Photo>();
+                       photoSet.add(photo);
+                       _app.informPhotosLoaded(photoSet);
+                       _app.informNoDataLoaded(); // To trigger load of next file if any
+               }
                else
                {
                        // Use text loader for everything else