altosui: revert AltosUIPreferences init() method

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 6993abab92ae2e49bb03cf621f537b56e50f065a..b5cbefe73a352ae78362c3d1c4679b5eef21a8c9 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -20,15 +20,9 @@ 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 libaltosJNI.*;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosUI extends AltosFrame {
        public AltosVoice voice = new AltosVoice();
@@ -47,7 +41,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) {
@@ -93,7 +87,7 @@ public class AltosUI extends AltosFrame {
                c.weighty = 1;
                b = new JButton(label);
 
-               Dimension ps = b.getPreferredSize();
+               //Dimension ps = b.getPreferredSize();
 
                gridbag.setConstraints(b, c);
                add(b, c);
@@ -104,11 +98,7 @@ public class AltosUI extends AltosFrame {
 
                load_library(null);
 
-               java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
-               if (imgURL != null)
-                       setIconImage(new ImageIcon(imgURL).getImage());
-
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
 
                pane = getContentPane();
                gridbag = new GridBagLayout();
@@ -262,9 +252,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() {
@@ -365,6 +355,8 @@ public class AltosUI extends AltosFrame {
                        in = new FileInputStream(file);
                        if (filename.endsWith("eeprom"))
                                return new AltosEepromIterable(in);
+                       else if (filename.endsWith("mega"))
+                               return new AltosEepromMegaIterable(in);
                        else
                                return new AltosTelemetryIterable(in);
                } catch (FileNotFoundException fe) {
@@ -400,39 +392,43 @@ public class AltosUI extends AltosFrame {
        static final int process_replay = 4;
        static final int process_summary = 5;
 
-       static void process_csv(String input) {
+       static boolean process_csv(String input) {
                AltosRecordIterable iterable = open_logfile(input);
                if (iterable == null)
-                       return;
+                       return false;
 
                String output = Altos.replace_extension(input,".csv");
                System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
                if (input.equals(output)) {
                        System.out.printf("Not processing '%s'\n", input);
+                       return false;
                } else {
                        AltosWriter writer = open_csv(output);
                        if (writer == null)
-                               return;
+                               return false;
                        writer.write(iterable);
                        writer.close();
                }
+               return true;
        }
 
-       static void process_kml(String input) {
+       static boolean process_kml(String input) {
                AltosRecordIterable iterable = open_logfile(input);
                if (iterable == null)
-                       return;
+                       return false;
 
                String output = Altos.replace_extension(input,".kml");
                System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
                if (input.equals(output)) {
                        System.out.printf("Not processing '%s'\n", input);
+                       return false;
                } else {
                        AltosWriter writer = open_kml(output);
                        if (writer == null)
-                               return;
+                               return false;
                        writer.write(iterable);
                        writer.close();
+                       return true;
                }
        }
 
@@ -445,7 +441,7 @@ public class AltosUI extends AltosFrame {
                        return null;
                }
                AltosRecordIterable recs;
-               AltosReplayReader reader;
+               //AltosReplayReader reader;
                if (file.getName().endsWith("eeprom")) {
                        recs = new AltosEepromIterable(in);
                } else {
@@ -465,25 +461,32 @@ public class AltosUI extends AltosFrame {
                return new AltosReplayReader(recs.iterator(), new File(filename));
        }
 
-       static void process_replay(String filename) {
+       static boolean process_replay(String filename) {
                AltosReplayReader reader = replay_file(filename);
+               if (reader == null)
+                       return false;
                AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
                flight_ui.set_exit_on_close();
+               return true;
        }
 
-       static void process_graph(String filename) {
+       static boolean process_graph(String filename) {
                AltosRecordIterable recs = record_iterable_file(filename);
                if (recs == null)
-                       return;
+                       return false;
                try {
                        new AltosGraphUI(recs, filename);
+                       return true;
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
+               return false;
        }
        
-       static void process_summary(String filename) {
+       static boolean process_summary(String filename) {
                AltosRecordIterable iterable = record_iterable_file(filename);
+               if (iterable == null)
+                       return false;
                try {
                        AltosFlightStats stats = new AltosFlightStats(iterable);
                        if (stats.serial > 0)
@@ -518,9 +521,11 @@ public class AltosUI extends AltosFrame {
                        System.out.printf("Flight time: %6.0f s\n",
                                          stats.state_end[Altos.ao_flight_main] -
                                          stats.state_start[Altos.ao_flight_boost]);
+                       return true;
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
+               return false;
        }
 
        public static void help(int code) {
@@ -535,8 +540,10 @@ public class AltosUI extends AltosFrame {
        }
        
        public static void main(final String[] args) {
+               int     errors = 0;
+               load_library(null);
                try {
-                       UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
+                       UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
                } catch (Exception e) {
                }
                /* Handle batch-mode */
@@ -577,23 +584,30 @@ public class AltosUI extends AltosFrame {
                                        switch (process) {
                                        case process_none:
                                        case process_graph:
-                                               process_graph(args[i]);
+                                               if (!process_graph(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_replay:
-                                               process_replay(args[i]);
+                                               if (!process_replay(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_kml:
-                                               process_kml(args[i]);
+                                               if (!process_kml(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_csv:
-                                               process_csv(args[i]);
+                                               if (!process_csv(args[i]))
+                                                       ++errors;
                                                break;
                                        case process_summary:
-                                               process_summary(args[i]);
+                                               if (!process_summary(args[i]))
+                                                       ++errors;
                                                break;
                                        }
                                }
                        }
                }
+               if (errors != 0)
+                       System.exit(errors);
        }
 }