X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fload%2FFileLoader.java;h=52bdef232942f0c5290d2c8160dccba45ce0ef92;hb=92dad5df664287acb51728e9ea599f150765d34a;hp=c1bf3dfc1a8e05d202bf00923f2cb94fc37d1017;hpb=5625a1abadb5f2ca5f017fe7dbda1d5141cb637b;p=GpsPrune.git

diff --git a/tim/prune/load/FileLoader.java b/tim/prune/load/FileLoader.java
index c1bf3df..52bdef2 100644
--- a/tim/prune/load/FileLoader.java
+++ b/tim/prune/load/FileLoader.java
@@ -1,14 +1,18 @@
 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 javax.swing.JOptionPane;
 
 import tim.prune.App;
-import tim.prune.I18nManager;
+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;
 
 
 /**
@@ -17,10 +21,14 @@ import tim.prune.load.xml.XmlFileLoader;
  */
 public class FileLoader
 {
+	private App _app;
 	private JFileChooser _fileChooser = null;
 	private JFrame _parentFrame;
 	private TextFileLoader _textFileLoader = null;
+	private NmeaFileLoader _nmeaFileLoader = null;
 	private XmlFileLoader _xmlFileLoader = null;
+	private ZipFileLoader _zipFileLoader = null;
+	private GzipFileLoader _gzipFileLoader = null;
 
 
 	/**
@@ -30,9 +38,13 @@ public class FileLoader
 	 */
 	public FileLoader(App inApp, JFrame inParentFrame)
 	{
+		_app = inApp;
 		_parentFrame = inParentFrame;
 		_textFileLoader = new TextFileLoader(inApp, inParentFrame);
-		_xmlFileLoader = new XmlFileLoader(inApp, inParentFrame);
+		_nmeaFileLoader = new NmeaFileLoader(inApp);
+		_xmlFileLoader = new XmlFileLoader(inApp);
+		_zipFileLoader = new ZipFileLoader(inApp, _xmlFileLoader);
+		_gzipFileLoader = new GzipFileLoader(inApp, _xmlFileLoader);
 	}
 
 
@@ -42,39 +54,101 @@ public class FileLoader
 	 */
 	public void openFile()
 	{
+		// Construct file chooser if necessary
 		if (_fileChooser == null)
+		{
 			_fileChooser = new JFileChooser();
+			_fileChooser.addChoosableFileFilter(new GenericFileFilter("filetype.txt", new String[] {"txt", "text"}));
+			_fileChooser.addChoosableFileFilter(new GenericFileFilter("filetype.gpx", new String[] {"gpx"}));
+			_fileChooser.addChoosableFileFilter(new GenericFileFilter("filetype.kml", new String[] {"kml"}));
+			_fileChooser.addChoosableFileFilter(new GenericFileFilter("filetype.kmz", new String[] {"kmz"}));
+			_fileChooser.setAcceptAllFileFilterUsed(true);
+			_fileChooser.setFileFilter(_fileChooser.getAcceptAllFileFilter()); // For some reason seems necessary
+			// start from directory in config if already set (by load jpegs)
+			String configDir = Config.getConfigString(Config.KEY_TRACK_DIR);
+			if (configDir == null) {configDir = Config.getConfigString(Config.KEY_PHOTO_DIR);}
+			if (configDir != null) {_fileChooser.setCurrentDirectory(new File(configDir));}
+			_fileChooser.setMultiSelectionEnabled(true); // Allow multiple selections
+		}
+		// Show the open dialog
 		if (_fileChooser.showOpenDialog(_parentFrame) == JFileChooser.APPROVE_OPTION)
 		{
-			File file = _fileChooser.getSelectedFile();
-			// Check file exists and is readable
-			if (file != null && file.exists() && file.canRead())
+			File[] files = _fileChooser.getSelectedFiles();
+			// Loop through files looking for files which exist and are readable
+			ArrayList<File> dataFiles = new ArrayList<File>();
+			if (files != null)
 			{
-				// Check file type to see if it's xml or just normal text
-				String fileExtension = file.getName().toLowerCase();
-				if (fileExtension.length() > 4)
-					{fileExtension = fileExtension.substring(fileExtension.length() - 4);}
-				if (fileExtension.equals(".kml") || fileExtension.equals(".gpx")
-					|| fileExtension.equals(".xml"))
-				{
-					// Use xml loader for kml, gpx and xml filenames
-					_xmlFileLoader.openFile(file);
-				}
-				else
+				for (int i=0; i<files.length; i++)
 				{
-					// Use text loader for everything else
-					_textFileLoader.openFile(file);
+					File file = files[i];
+					if (file.exists() && file.isFile() && file.canRead())
+					{
+						dataFiles.add(file);
+					}
 				}
 			}
+			if (dataFiles.size() > 0) {
+				_app.loadDataFiles(dataFiles);
+			}
 			else
 			{
-				// couldn't read file - show error message
-				JOptionPane.showMessageDialog(_parentFrame, I18nManager.getText("error.load.noread"),
-					I18nManager.getText("error.load.dialogtitle"), JOptionPane.ERROR_MESSAGE);
+				// couldn't find any files to load - show error message
+				_app.showErrorMessage("error.load.dialogtitle", "error.load.noread");
 			}
 		}
 	}
 
+	/**
+	 * Open the selected input file
+	 * @param inFile file to open
+	 */
+	public void openFile(File inFile)
+	{
+		// Store directory in config for later
+		File parent = inFile.getParentFile();
+		if (parent != null) {
+			Config.setConfigString(Config.KEY_TRACK_DIR, parent.getAbsolutePath());
+		}
+		// 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.equals(".kml") || fileExtension.equals(".gpx")
+			|| fileExtension.equals(".xml"))
+		{
+			// Use xml loader for kml, gpx and xml filenames
+			_xmlFileLoader.openFile(inFile);
+		}
+		else if (fileExtension.equals(".kmz") || fileExtension.equals(".zip"))
+		{
+			// Use zip loader for zipped kml (or zipped gpx)
+			_zipFileLoader.openFile(inFile);
+		}
+		else if (fileExtension.endsWith(".gz") || fileExtension.equals("gzip"))
+		{
+			// Use gzip loader for gzipped xml
+			_gzipFileLoader.openFile(inFile);
+		}
+		else if (fileExtension.equals("nmea"))
+		{
+			_nmeaFileLoader.openFile(inFile);
+		}
+		else if (fileExtension.equals(".jpg") || fileExtension.equals("jpeg"))
+		{
+			Photo photo = JpegLoader.createPhoto(inFile);
+			TreeSet<Photo> photoSet = new TreeSet<Photo>(new MediaSorter());
+			photoSet.add(photo);
+			_app.informPhotosLoaded(photoSet);
+			_app.informNoDataLoaded(); // To trigger load of next file if any
+		}
+		else
+		{
+			// Use text loader for everything else
+			_textFileLoader.openFile(inFile);
+		}
+	}
+
 	/**
 	 * @return the last delimiter character used for a text file load
 	 */