projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ICP3 working
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index b2ae485801212dc4198ffb03e91513866f4c581c..43df705e96add4f6ff98777d586567c0db1dec8e 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-20,13
+20,8
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
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 java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
@@
-143,7
+138,8
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
}
}
} catch (Exception e) {
}
}
} catch (Exception e) {
- System.out.print("Show exception" + e);
+ System.out.print("Show exception " + e + "\n");
+ e.printStackTrace();
}
}
}
}
@@
-159,7
+155,7
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
ActionListener show_timer;
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
ActionListener show_timer;
public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
- AltosPreferences.set_component(this);
+ Altos
UI
Preferences.set_component(this);
voice = in_voice;
reader = in_reader;
voice = in_voice;
reader = in_reader;
@@
-169,16
+165,12
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
GridBagConstraints c = new GridBagConstraints();
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
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(Altos
UI
Preferences.frequency(serial));
frequencies.set_product("Monitor");
frequencies.set_serial(serial);
frequencies.addActionListener(new ActionListener() {
frequencies.set_product("Monitor");
frequencies.set_serial(serial);
frequencies.addActionListener(new ActionListener() {
@@
-298,7
+290,7
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
- AltosPreferences.register_font_listener(this);
+ Altos
UI
Preferences.register_font_listener(this);
addWindowListener(new WindowAdapter() {
@Override
addWindowListener(new WindowAdapter() {
@Override
@@
-306,7
+298,7
@@
public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
disconnect();
setVisible(false);
dispose();
disconnect();
setVisible(false);
dispose();
- AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+ Altos
UI
Preferences.unregister_font_listener(AltosFlightUI.this);
if (exit_on_close)
System.exit(0);
}
if (exit_on_close)
System.exit(0);
}