projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Add floating point math functions from newlib
[fw/altos]
/
altosui
/
AltosCSVUI.java
diff --git
a/altosui/AltosCSVUI.java
b/altosui/AltosCSVUI.java
index 1d024086514e8161d91a46d2170a789940ac37c6..c41ea74b5190dba3a7c5868db374cfec20db9613 100644
(file)
--- a/
altosui/AltosCSVUI.java
+++ b/
altosui/AltosCSVUI.java
@@
-21,16
+21,17
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
import java.awt.event.*;
import javax.swing.*;
import java.io.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altosuilib_1.*;
public class AltosCSVUI
public class AltosCSVUI
- extends AltosDialog
+ extends Altos
UI
Dialog
implements ActionListener
{
JFileChooser csv_chooser;
JPanel accessory;
JComboBox combo_box;
implements ActionListener
{
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)" };
AltosWriter writer;
static String[] combo_box_items = { "Comma Separated Values (.CSV)", "Googleearth Data (.KML)" };
@@
-54,8
+55,8
@@
public class AltosCSVUI
set_default_file();
}
set_default_file();
}
- public AltosCSVUI(JFrame frame, Altos
RecordIterable in_iterable
, File source_file) {
-
iterable = in_iterable
;
+ public AltosCSVUI(JFrame frame, Altos
StateIterable states
, File source_file) {
+
this.states = states
;
csv_chooser = new JFileChooser(source_file);
accessory = new JPanel();
csv_chooser = new JFileChooser(source_file);
accessory = new JPanel();
@@
-90,7
+91,7
@@
public class AltosCSVUI
writer = new AltosCSV(file);
else
writer = new AltosKML(file);
writer = new AltosCSV(file);
else
writer = new AltosKML(file);
- writer.write(
iterable
);
+ writer.write(
states
);
writer.close();
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(frame,
writer.close();
} catch (FileNotFoundException ee) {
JOptionPane.showMessageDialog(frame,