X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosuilib%2FAltosCSVUI.java;h=c8c6161c7978e6b9ec3a8ccc59b000d2c8b437b9;hp=6328d37dea1bd67d0934dea8941fdc755840b471;hb=119a829e58aff5dd7801fe7ef8cae886bf31fec1;hpb=c8078d352a7f54a4a97d25af080155d3f875536a

diff --git a/altosuilib/AltosCSVUI.java b/altosuilib/AltosCSVUI.java
index 6328d37d..c8c6161c 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_3;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altoslib_13.*;
 
 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,