From c89a34d1eb25155405b0036baeadc7bbfeade1c2 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Mon, 27 Sep 2010 17:11:48 -0700
Subject: altosui: Create iterables for log file scanning. Split out display
 threads

Convert from log file reading paradigm to using iterators which is
more idiomatic for java. Split more code out of AltosUI.java,
including the display update threads for telemetry monitoring and
logfile replay.x

Signed-off-by: Keith Packard <keithp@keithp.com>
---
 ao-tools/altosui/AltosCSVUI.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'ao-tools/altosui/AltosCSVUI.java')

diff --git a/ao-tools/altosui/AltosCSVUI.java b/ao-tools/altosui/AltosCSVUI.java
index 643d4112..4eb72de8 100644
--- 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();
 		}
 	}
-- 
cgit v1.2.3