X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosCSVUI.java;h=e1b6002dfa23235d08a1fb5ae4a92a537be5e15e;hp=16f253380419029dfb788823741e18ec550276c5;hb=357826aa9c7b42c59f5d52b8eb016d73b6da0c7f;hpb=8463ffcaca6bcd31e645aba71c171f548dce96d8

diff --git a/ao-tools/altosui/AltosCSVUI.java b/ao-tools/altosui/AltosCSVUI.java
index 16f25338..e1b6002d 100644
--- a/ao-tools/altosui/AltosCSVUI.java
+++ b/ao-tools/altosui/AltosCSVUI.java
@@ -30,16 +30,15 @@ import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosCSVUI
 	extends JDialog
-	implements Runnable, ActionListener
+	implements ActionListener
 {
-	JFrame			frame;
-	Thread			thread;
-	AltosRecordIterable	iterable;
-	AltosWriter		writer;
 	JFileChooser		csv_chooser;
+	JPanel			accessory;
 	JComboBox		combo_box;
+	AltosRecordIterable	iterable;
+	AltosWriter		writer;
 
-	static String[]		combo_box_items = { "CSV", "KML" };
+	static String[]		combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
 
 	void set_default_file() {
 		File	current = csv_chooser.getSelectedFile();
@@ -47,57 +46,63 @@ public class AltosCSVUI
 		String	new_name = null;
 		String	selected = (String) combo_box.getSelectedItem();
 
-		if (selected.equals("CSV"))
+		if (selected.contains("CSV"))
 			new_name = Altos.replace_extension(current_name, ".csv");
-		else if (selected.equals("KML"))
+		else if (selected.contains("KML"))
 			new_name = Altos.replace_extension(current_name, ".kml");
 		if (new_name != null)
 			csv_chooser.setSelectedFile(new File(new_name));
 	}
 
-	public void run() {
-		AltosLogfileChooser	chooser;
+	public void actionPerformed(ActionEvent e) {
+		if (e.getActionCommand().equals("comboBoxChanged"))
+			set_default_file();
+	}
+
+	public AltosCSVUI(JFrame frame, AltosRecordIterable in_iterable, File source_file) {
+		iterable = in_iterable;
+		csv_chooser = new JFileChooser(source_file);
+
+		accessory = new JPanel();
+		accessory.setLayout(new GridBagLayout());
 
-		chooser = new AltosLogfileChooser(frame);
-		iterable = chooser.runDialog();
-		if (iterable == null)
-			return;
+		GridBagConstraints	c = new GridBagConstraints();
+		c.fill = GridBagConstraints.NONE;
+		c.weightx = 1;
+		c.weighty = 0;
+		c.insets = new Insets (4, 4, 4, 4);
+
+		JLabel accessory_label = new JLabel("Export File Type");
+		c.gridx = 0;
+		c.gridy = 0;
+		accessory.add(accessory_label, c);
 
-		csv_chooser = new JFileChooser(chooser.file());
 		combo_box = new JComboBox(combo_box_items);
 		combo_box.addActionListener(this);
-		csv_chooser.setAccessory(combo_box);
-		csv_chooser.setSelectedFile(chooser.file());
+		c.gridx = 0;
+		c.gridy = 1;
+		accessory.add(combo_box, c);
+
+		csv_chooser.setAccessory(accessory);
+		csv_chooser.setSelectedFile(source_file);
 		set_default_file();
 		int ret = csv_chooser.showSaveDialog(frame);
 		if (ret == JFileChooser.APPROVE_OPTION) {
-			File 	file = csv_chooser.getSelectedFile();
-			String	type = (String) combo_box.getSelectedItem();
+			File file = csv_chooser.getSelectedFile();
+			String type = (String) combo_box.getSelectedItem();
 			try {
-				if (type.equals("CSV"))
+				if (type.contains("CSV"))
 					writer = new AltosCSV(file);
 				else
 					writer = new AltosKML(file);
+				writer.write(iterable);
+				writer.close();
 			} catch (FileNotFoundException ee) {
 				JOptionPane.showMessageDialog(frame,
 							      file.getName(),
 							      "Cannot open file",
 							      JOptionPane.ERROR_MESSAGE);
 			}
-			writer.write(iterable);
-			writer.close();
 		}
 	}
-
-	public void actionPerformed(ActionEvent e) {
-		System.out.printf("command %s param %s\n", e.getActionCommand(), e.paramString());
-		if (e.getActionCommand().equals("comboBoxChanged"))
-			set_default_file();
-	}
-
-	public AltosCSVUI(JFrame in_frame) {
-		frame = in_frame;
-		thread = new Thread(this);
-		thread.start();
-	}
 }