X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSVUI.java;h=05cabcdf4bcc68a4b6ccfe2e9d1ab7463ce3030a;hp=152b4b279b84a60031b4eabb9bb39efdf14b1eea;hb=6367ab2dec718c512073f70dfab86dbd1656b1fe;hpb=5a3c5de6657d1c26e52015a8acec0cd05e294cef

diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 152b4b27..05cabcdf 100644
--- a/altosui/AltosCSVUI.java
+++ b/altosui/AltosCSVUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
-import org.altusmetrum.altoslib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
 public class AltosCSVUI
 	extends AltosUIDialog
@@ -31,7 +31,7 @@ public class AltosCSVUI
 	JFileChooser		csv_chooser;
 	JPanel			accessory;
 	JComboBox		combo_box;
-	AltosRecordIterable	iterable;
+	Iterable<AltosState>	states;
 	AltosWriter		writer;
 
 	static String[]		combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
@@ -55,8 +55,8 @@ public class AltosCSVUI
 			set_default_file();
 	}
 
-	public AltosCSVUI(JFrame frame, AltosRecordIterable in_iterable, File source_file) {
-		iterable = in_iterable;
+	public AltosCSVUI(JFrame frame, AltosStateIterable states, File source_file) {
+		this.states = states;
 		csv_chooser = new JFileChooser(source_file);
 
 		accessory = new JPanel();
@@ -91,7 +91,7 @@ public class AltosCSVUI
 					writer = new AltosCSV(file);
 				else
 					writer = new AltosKML(file);
-				writer.write(iterable);
+				writer.write(states);
 				writer.close();
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(frame,