X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosCSVUI.java;h=24720e9cb168e7ee914de8aaa8c2fb3cbae9f060;hp=9d67ce8dacbbf4226cfe2663b7f84a7d2d9494bc;hb=HEAD;hpb=97adfff4cfb67c17a96f3ff46606b4e439422b01

diff --git a/altosuilib/AltosCSVUI.java b/altosuilib/AltosCSVUI.java
index 9d67ce8d..24720e9c 100644
--- a/altosuilib/AltosCSVUI.java
+++ b/altosuilib/AltosCSVUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,13 +16,13 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosCSVUI
 	extends AltosUIDialog
@@ -30,7 +31,8 @@ public class AltosCSVUI
 	JFileChooser		csv_chooser;
 	JPanel			accessory;
 	JComboBox<String>	combo_box;
-	Iterable<AltosState>	states;
+	AltosFlightSeries	series;
+	AltosCalData		cal_data;
 	AltosWriter		writer;
 
 	static String[]		combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
@@ -54,8 +56,9 @@ public class AltosCSVUI
 			set_default_file();
 	}
 
-	public AltosCSVUI(JFrame frame, AltosStateIterable states, File source_file) {
-		this.states = states;
+	public AltosCSVUI(JFrame frame, AltosFlightSeries series, File source_file) {
+		this.series = series;
+		this.cal_data = series.cal_data();
 		csv_chooser = new JFileChooser(source_file);
 
 		accessory = new JPanel();
@@ -90,7 +93,7 @@ public class AltosCSVUI
 					writer = new AltosCSV(file);
 				else
 					writer = new AltosKML(file);
-				writer.write(states);
+				writer.write(series);
 				writer.close();
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(frame,