X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosDataChooser.java;h=b417c732239a9292bef679688cb5ea08b6755f18;hb=6d14f809b54b99725447a934047167c2e7febe82;hp=a8c74926381482d0b108575377253c1e5994484c;hpb=0641326842bffbf4b3ae69459ca540131cb64e59;p=fw%2Faltos

diff --git a/altosuilib/AltosDataChooser.java b/altosuilib/AltosDataChooser.java
index a8c74926..b417c732 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_12;
 
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
 
 public class AltosDataChooser extends JFileChooser {
 	JFrame	frame;
@@ -36,7 +36,7 @@ public class AltosDataChooser extends JFileChooser {
 		return file;
 	}
 
-	public AltosStateIterable runDialog() {
+	public AltosRecordSet runDialog() {
 		int	ret;
 
 		ret = showOpenDialog(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(),