X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=89f66c0604521bf89e3de6c10d25586345bd2658;hb=170510bb183715e9ba580b180f20657d6602644e;hp=3e5bcf434fc5b8b8276fe2074873e528d8032d74;hpb=f6f54d70b768dca1715ddddea64a4df00d82b09e;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 3e5bcf43..89f66c06 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosUI extends JFrame {
+public class AltosUI extends AltosFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -423,17 +423,17 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	static AltosRecordIterable record_iterable_file(String filename) {
+	static AltosRecordIterable record_iterable(File file) {
 		FileInputStream in;
 		try {
-			in = new FileInputStream(filename);
+			in = new FileInputStream(file);
 		} catch (Exception e) {
-			System.out.printf("Failed to open file '%s'\n", filename);
+			System.out.printf("Failed to open file '%s'\n", file);
 			return null;
 		}
 		AltosRecordIterable recs;
 		AltosReplayReader reader;
-		if (filename.endsWith("eeprom")) {
+		if (file.getName().endsWith("eeprom")) {
 			recs = new AltosEepromIterable(in);
 		} else {
 			recs = new AltosTelemetryIterable(in);
@@ -441,6 +441,10 @@ public class AltosUI extends JFrame {
 		return recs;
 	}
 
+	static AltosRecordIterable record_iterable_file(String filename) {
+		return record_iterable (new File(filename));
+	}
+
 	static AltosReplayReader replay_file(String filename) {
 		AltosRecordIterable recs = record_iterable_file(filename);
 		if (recs == null)
@@ -466,9 +470,9 @@ public class AltosUI extends JFrame {
 	}
 	
 	static void process_summary(String filename) {
-		AltosReplayReader reader = replay_file(filename);
+		AltosRecordIterable iterable = record_iterable_file(filename);
 		try {
-			AltosFlightStats stats = new AltosFlightStats(reader);
+			AltosFlightStats stats = new AltosFlightStats(iterable);
 			if (stats.serial > 0)
 				System.out.printf("Serial:       %5d\n", stats.serial);
 			if (stats.flight > 0)
@@ -519,7 +523,7 @@ public class AltosUI extends JFrame {
 	
 	public static void main(final String[] args) {
 		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+			UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
 		} catch (Exception e) {
 		}
 		/* Handle batch-mode */