Merge remote-tracking branch 'origin/micropeak-logging'

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index c1a66b835692c695f232f401a1030002602ee583..70142a93b5d3beeb6d7e0a8c75b8308e31800273 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -20,18 +20,12 @@ 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.*;
+import org.altusmetrum.altosuilib.*;
 
-import libaltosJNI.*;
-
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();
 
        public static boolean load_library(Frame frame) {
@@ -94,7 +88,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);
@@ -248,7 +242,7 @@ public class AltosUI extends AltosFrame {
        }
 
        private void ConnectToDevice() {
-               AltosDevice     device = AltosDeviceDialog.show(AltosUI.this,
+               AltosDevice     device = AltosDeviceUIDialog.show(AltosUI.this,
                                                                Altos.product_basestation);
 
                if (device != null)
@@ -448,9 +442,11 @@ public class AltosUI extends AltosFrame {
                        return null;
                }
                AltosRecordIterable recs;
-               AltosReplayReader reader;
+               //AltosReplayReader reader;
                if (file.getName().endsWith("eeprom")) {
                        recs = new AltosEepromIterable(in);
+               } else if (file.getName().endsWith("mega")) {
+                       recs = new AltosEepromMegaIterable(in);
                } else {
                        recs = new AltosTelemetryIterable(in);
                }