X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosCSVUI.java;h=a0fceee52afd6b7c0c9be0b7622fd4ad47d7aa7d;hp=4250834691755ad725dd948d98deedb7b6030a38;hb=4cec35564324f909dcddeb7c0d83a2daa8223042;hpb=bf88c5f829ea5d32043431945e862a9f6c96740a

diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 42508346..a0fceee5 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_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosCSVUI
 	extends AltosUIDialog
@@ -30,8 +30,8 @@ public class AltosCSVUI
 {
 	JFileChooser		csv_chooser;
 	JPanel			accessory;
-	JComboBox		combo_box;
-	AltosRecordIterable	iterable;
+	JComboBox<String>	combo_box;
+	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();
@@ -73,7 +73,7 @@ public class AltosCSVUI
 		c.gridy = 0;
 		accessory.add(accessory_label, c);
 
-		combo_box = new JComboBox(combo_box_items);
+		combo_box = new JComboBox<String>(combo_box_items);
 		combo_box.addActionListener(this);
 		c.gridx = 0;
 		c.gridy = 1;
@@ -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,