altosui: Create iterables for log file scanning. Split out display threads

[fw/altos] / ao-tools / altosui / AltosCSVUI.java

diff --git a/ao-tools/altosui/AltosCSVUI.java b/ao-tools/altosui/AltosCSVUI.java
index 643d4112ae96666107a33e43c8f0d2f59fca6605..4eb72de820f9f6bd0af3a94fc75c0fcb4fc1ae90 100644 (file)
--- a/ao-tools/altosui/AltosCSVUI.java
+++ b/ao-tools/altosui/AltosCSVUI.java
@@ -35,17 +35,17 @@ public class AltosCSVUI
        extends JDialog
        implements Runnable, ActionListener
 {
-       JFrame          frame;
-       Thread          thread;
-       AltosReader     reader;
-       AltosCSV        writer;
+       JFrame                  frame;
+       Thread                  thread;
+       AltosRecordIterable     iterable;
+       AltosCSV                writer;
 
        public void run() {
                AltosLogfileChooser     chooser;
 
                chooser = new AltosLogfileChooser(frame);
-               reader = chooser.runDialog();
-               if (reader == null)
+               iterable = chooser.runDialog();
+               if (iterable == null)
                        return;
                JFileChooser    csv_chooser;
 
@@ -67,8 +67,7 @@ public class AltosCSVUI
                                                              "Cannot open file",
                                                              JOptionPane.ERROR_MESSAGE);
                        }
-                       writer.write(reader);
-                       reader.close();
+                       writer.write(iterable);
                        writer.close();
                }
        }