Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 7d4b2edbf4708892fd3e46d83665de6525745a1b..a16782993b2e00ce42082a97412205c71abb2563 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package AltosUI;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;
 
@@ -47,7 +48,7 @@ public class AltosUI extends AltosFrame {
 
        void telemetry_window(AltosDevice device) {
                try {
-                       AltosFlightReader reader = new AltosTelemetryReader(device);
+                       AltosFlightReader reader = new AltosTelemetryReader(new AltosSerial(device));
                        if (reader != null)
                                new AltosFlightUI(voice, reader, device.getSerial());
                } catch (FileNotFoundException ee) {
@@ -108,7 +109,7 @@ public class AltosUI extends AltosFrame {
                if (imgURL != null)
                        setIconImage(new ImageIcon(imgURL).getImage());
 
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
 
                pane = getContentPane();
                gridbag = new GridBagLayout();
@@ -262,9 +263,9 @@ public class AltosUI extends AltosFrame {
                String  result;
                result = JOptionPane.showInputDialog(AltosUI.this,
                                                     "Configure Callsign",
-                                                    AltosPreferences.callsign());
+                                                    AltosUIPreferences.callsign());
                if (result != null)
-                       AltosPreferences.set_callsign(result);
+                       AltosUIPreferences.set_callsign(result);
        }
 
        void ConfigureTeleMetrum() {
@@ -537,8 +538,9 @@ public class AltosUI extends AltosFrame {
        }
        
        public static void main(final String[] args) {
+               load_library(null);
                try {
-                       UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+                       UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
                } catch (Exception e) {
                }
                /* Handle batch-mode */