X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=c8faab90f4086ad31f87cdae42bf037268f27255;hb=17455da530833d3db03ee2ace7b15130ed307670;hp=d99da43dea0622b4f50bbd53ddbabeeb647bea9d;hpb=d77a4ea206d627635159f35c76c744687d4e633b;p=fw%2Faltos

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index d99da43d..c8faab90 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -20,30 +20,11 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altosuilib_1.*;
 
-class AltosFlightStatusUpdate implements ActionListener {
-
-	public AltosState	saved_state;
-	AltosFlightStatus	flightStatus;
-
-	public void actionPerformed (ActionEvent e) {
-		if (saved_state != null)
-			flightStatus.show(saved_state, 0);
-	}
-
-	public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) {
-		flightStatus = in_flightStatus;
-	}
-}
-
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
@@ -158,7 +139,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 			}
 		}
 		} catch (Exception e) {
-			System.out.print("Show exception" + e);
+			System.out.print("Show exception " + e + "\n");
+			e.printStackTrace();
 		}
 	}
 
@@ -174,7 +156,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 	ActionListener	show_timer;
 
 	public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-		AltosPreferences.set_component(this);
+		AltosUIPreferences.set_component(this);
 
 		voice = in_voice;
 		reader = in_reader;
@@ -184,16 +166,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		GridBagConstraints c = new GridBagConstraints();
 
-		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-		if (imgURL != null)
-			setIconImage(new ImageIcon(imgURL).getImage());
-
 		setTitle(String.format("AltOS %s", reader.name));
 
 		/* Stick channel selector at top of table for telemetry monitoring */
 		if (serial >= 0) {
 			// Channel menu
-			frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.set_product("Monitor");
 			frequencies.set_serial(serial);
 			frequencies.addActionListener(new ActionListener() {
@@ -313,7 +291,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-		AltosPreferences.register_font_listener(this);
+		AltosUIPreferences.register_font_listener(this);
 
 		addWindowListener(new WindowAdapter() {
 				@Override
@@ -321,7 +299,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 					disconnect();
 					setVisible(false);
 					dispose();
-					AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+					AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
 					if (exit_on_close)
 						System.exit(0);
 				}