X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosDataChooser.java;h=caa63e7a4deb702ab0a5a1b54437c06828c90cab;hp=c6d53a311eaf37c8110d73b9e38c6e6251878208;hb=2f87e182d9f0b3c2856f62149371ad70b16148cf;hpb=e6eb659b0e984515a33b3ddabfe8325742a952da

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index c6d53a31..caa63e7a 100644
--- a/altosuilib/AltosDataChooser.java
+++ b/altosuilib/AltosDataChooser.java
@@ -16,12 +16,12 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_13;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
@@ -44,22 +44,8 @@ public class AltosDataChooser extends JFileChooser {
 			file = getSelectedFile();
 			if (file == null)
 				return null;
-			filename = file.getName();
 			try {
-				if (filename.endsWith("eeprom")) {
-					FileReader in = new FileReader(file);
-					return new AltosEepromFile(in);
-				} else if (filename.endsWith("telem")) {
-					FileInputStream in = new FileInputStream(file);
-					return new AltosTelemetryFile(in);
-				} else {
-					throw new FileNotFoundException();
-				}
-			} catch (FileNotFoundException fe) {
-				JOptionPane.showMessageDialog(frame,
-							      fe.getMessage(),
-							      "Cannot open file",
-							      JOptionPane.ERROR_MESSAGE);
+				return AltosLib.record_set(file);
 			} catch (IOException ie) {
 				JOptionPane.showMessageDialog(frame,
 							      ie.getMessage(),