Merge remote-tracking branch 'mjb/altosui_mjb'

diff --git a/altosui/Altos.java b/altosui/Altos.java
index cd17a93e1b6fb6938bf09f81c6995bb644fd9700..98af26bc3943c8e821ffb73a742dc88b6c47378b 100644 (file)
--- a/altosui/Altos.java
+++ b/altosui/Altos.java
@@ -18,10 +18,6 @@
 package altosui;
 
 import java.awt.*;
-import java.util.*;
-import java.text.*;
-import java.nio.charset.Charset;
-
 import libaltosJNI.*;
 
 import org.altusmetrum.AltosLib.*;

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 3fe517aa6bb08388aeef0874e11ff2577dac8e89..007c74ec639694ea46aeda47d960e1886b3d06be 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.java
@@ -18,15 +18,7 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosAscent extends JComponent implements AltosFlightDisplay {

diff --git a/altosui/AltosBTDevice.java b/altosui/AltosBTDevice.java
index 5e353fddc42be0433dbba9ff8a292f924975bf88..03e7cbeca929c97e4030b76c0346df4bd99f6b3d 100644 (file)
--- a/altosui/AltosBTDevice.java
+++ b/altosui/AltosBTDevice.java
@@ -16,8 +16,6 @@
  */
 
 package altosui;
-import java.lang.*;
-import java.util.*;
 import libaltosJNI.*;
 
 public class AltosBTDevice extends altos_bt_device implements AltosDevice {
@@ -79,11 +77,13 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
                return libaltos.altos_bt_open(this);
        }
 
+       /*
        private boolean isAltusMetrum() {
                if (getName().startsWith(Altos.bt_product_telebt))
                        return true;
                return false;
        }
+       */
 
        public boolean matchProduct(int want_product) {
 

diff --git a/altosui/AltosBTDeviceIterator.java b/altosui/AltosBTDeviceIterator.java
index 58ed86d551905ceaa0573a7060eb1dfb7df8fd24..4be5edf5e50693def94c9912a08843fb13a28efa 100644 (file)
--- a/altosui/AltosBTDeviceIterator.java
+++ b/altosui/AltosBTDeviceIterator.java
@@ -16,7 +16,6 @@
  */
 
 package altosui;
-import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
 

diff --git a/altosui/AltosBTKnown.java b/altosui/AltosBTKnown.java
index 6a8e53cb9dd3699d3f202cd9970f5c8706cff508..74cc6838455264e040076127012dd5ca1d692751 100644 (file)
--- a/altosui/AltosBTKnown.java
+++ b/altosui/AltosBTKnown.java
@@ -16,9 +16,7 @@
  */
 
 package altosui;
-import java.lang.*;
 import java.util.*;
-import libaltosJNI.*;
 import java.util.prefs.*;
 
 public class AltosBTKnown implements Iterable<AltosBTDevice> {

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index aeb964bba270d30c9ce87c1f92b8c15a412d02d0..9a28d72b61e4fb1879b16f9c269b3643a79f0a3a 100644 (file)
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -20,18 +20,9 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
 import javax.swing.plaf.basic.*;
-import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
-
-import libaltosJNI.*;
 
 public class AltosBTManage extends AltosDialog implements ActionListener, Iterable<AltosBTDevice> {
        LinkedBlockingQueue<AltosBTDevice> found_devices;

diff --git a/altosui/AltosCSV.java b/altosui/AltosCSV.java
index c876d9cabe9a1073fb37eb62641ead19acc8e28c..f8cc1ed6b1d12240a34ee74a7b28bfbc1018564c 100644 (file)
--- a/altosui/AltosCSV.java
+++ b/altosui/AltosCSV.java
@@ -17,9 +17,7 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
 import java.util.*;
 import org.altusmetrum.AltosLib.*;
 

diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 2702668bfb9fdf768c9b2ced2702530c20aebc88..1d024086514e8161d91a46d2170a789940ac37c6 100644 (file)
--- a/altosui/AltosCSVUI.java
+++ b/altosui/AltosCSVUI.java
@@ -20,13 +20,7 @@ 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosCSVUI

diff --git a/altosui/AltosChannelMenu.java b/altosui/AltosChannelMenu.java
index 0249a0bd4197bb5006a179e5ca85cfb8b1b7a782..f90a11c0aa93a13b60eb3d761d01ee2a2b157ba9 100644 (file)
--- a/altosui/AltosChannelMenu.java
+++ b/altosui/AltosChannelMenu.java
@@ -17,17 +17,8 @@
 
 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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosChannelMenu extends JComboBox implements ActionListener {
        int                             channel;

diff --git a/altosui/AltosCompanionInfo.java b/altosui/AltosCompanionInfo.java
index 4ba8fe985b794d0d40dc61b6e57c1c30f5d05723..f2019438d421b7ba6d8647b305a32265b8a2c6b8 100644 (file)
--- a/altosui/AltosCompanionInfo.java
+++ b/altosui/AltosCompanionInfo.java
@@ -18,15 +18,7 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosCompanionInfo extends JTable {

diff --git a/altosui/AltosConfig.java b/altosui/AltosConfig.java
index cae41858d93525c851791b174b43e61378eaba70..44e5a3faf4c5265414476cbc0bc31464543c5a4a 100644 (file)
--- a/altosui/AltosConfig.java
+++ b/altosui/AltosConfig.java
@@ -17,20 +17,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 libaltosJNI.*;
-
 public class AltosConfig implements ActionListener {
 
        class int_ref {
@@ -510,11 +502,6 @@ public class AltosConfig implements ActionListener {
                                                                            device.toShortString()),
                                                              "Device in use",
                                                              JOptionPane.ERROR_MESSAGE);
-                       } catch (IOException ee) {
-                               JOptionPane.showMessageDialog(owner,
-                                                             device.toShortString(),
-                                                             ee.getLocalizedMessage(),
-                                                             JOptionPane.ERROR_MESSAGE);
                        }
                }
        }

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index 7958a21c29cd26533ad4a988a40c35b4e2139fa5..918748f7d4918ce04d8478f046b2518a22844a14 100644 (file)
--- a/altosui/AltosConfigFreqUI.java
+++ b/altosui/AltosConfigFreqUI.java
@@ -20,15 +20,7 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
-import javax.swing.plaf.basic.*;
-import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 
 class AltosEditFreqUI extends AltosDialog implements ActionListener {

diff --git a/altosui/AltosConfigTD.java b/altosui/AltosConfigTD.java
index 71d628b310c731a69eb8f25f88fdc3140efed2df..e7b9b81f691cbf085c5d73f50cc379664ac3fe15 100644 (file)
--- a/altosui/AltosConfigTD.java
+++ b/altosui/AltosConfigTD.java
@@ -17,19 +17,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 libaltosJNI.*;
-
 import org.altusmetrum.AltosLib.*;
 
 public class AltosConfigTD implements ActionListener {
@@ -345,11 +337,6 @@ public class AltosConfigTD implements ActionListener {
                                                                            device.toShortString()),
                                                              "Device in use",
                                                              JOptionPane.ERROR_MESSAGE);
-                       } catch (IOException ee) {
-                               JOptionPane.showMessageDialog(owner,
-                                                             device.toShortString(),
-                                                             ee.getLocalizedMessage(),
-                                                             JOptionPane.ERROR_MESSAGE);
                        }
                }
        }

diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index f2058f6968881808ee11b3bad391c2c9481bb31e..532a49fa1cd2b66cf98b3ff3fad930f69a40f7f9 100644 (file)
--- a/altosui/AltosConfigTDUI.java
+++ b/altosui/AltosConfigTDUI.java
@@ -20,17 +20,7 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import libaltosJNI.*;
-
 import org.altusmetrum.AltosLib.*;
 
 public class AltosConfigTDUI

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 62394fa6ca722c3c143d90d78b321ebb83202876..dd34a9cf348c84dbbb4a219652527f2e0db0c5a8 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -20,18 +20,9 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
-import libaltosJNI.*;
-
 public class AltosConfigUI
        extends AltosDialog
        implements ActionListener, ItemListener, DocumentListener
@@ -750,12 +741,12 @@ public class AltosConfigUI
        }
 
        public void set_flight_log_max_limit(int flight_log_max_limit) {
-               boolean any_added = false;
+               //boolean       any_added = false;
                flight_log_max_value.removeAllItems();
                for (int i = 0; i < flight_log_max_values.length; i++) {
                        if (Integer.parseInt(flight_log_max_values[i]) < flight_log_max_limit){
                                flight_log_max_value.addItem(flight_log_max_values[i]);
-                               any_added = true;
+                               //any_added = true;
                        }
                }
                flight_log_max_value.addItem(String.format("%d", flight_log_max_limit));

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 249fc35a17393d67537c4f6fd620d4f29c1f26d4..c576b052f71f2db15e9360ba253fbfc9762ad2fa 100644 (file)
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -21,16 +21,7 @@ import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
-import javax.swing.plaf.basic.*;
-import org.altusmetrum.AltosLib.*;
 
 class DelegatingRenderer implements ListCellRenderer {
 
@@ -297,6 +288,7 @@ public class AltosConfigureUI
                c.anchor = GridBagConstraints.WEST;
                pane.add(new JLabel("Look & feel"), c);
 
+               /*
                class LookAndFeelRenderer extends BasicComboBoxRenderer implements ListCellRenderer {
 
                        public LookAndFeelRenderer() {
@@ -315,6 +307,7 @@ public class AltosConfigureUI
                                return this;
                        }
                }
+               */
 
                final UIManager.LookAndFeelInfo[] look_and_feels = UIManager.getInstalledLookAndFeels();
 

diff --git a/altosui/AltosDataChooser.java b/altosui/AltosDataChooser.java
index 4bd51c3938e61635bfb6ef49c6466c50304e7b8a..4d2f321ec454c6ec08c8541fa682cc44b76360ad 100644 (file)
--- a/altosui/AltosDataChooser.java
+++ b/altosui/AltosDataChooser.java
@@ -17,15 +17,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 org.altusmetrum.AltosLib.*;
 
 public class AltosDataChooser extends JFileChooser {

diff --git a/altosui/AltosDataPointReader.java b/altosui/AltosDataPointReader.java
index 821b0771b7f7101ee200dd358822b34958020a3c..2316cf97e1e36bcf447869b4dae248c4a9ab0999 100644 (file)
--- a/altosui/AltosDataPointReader.java
+++ b/altosui/AltosDataPointReader.java
@@ -4,8 +4,6 @@
 
 package altosui;
 
-import java.io.IOException;
-import java.text.ParseException;
 import java.lang.UnsupportedOperationException;
 import java.util.NoSuchElementException;
 import java.util.Iterator;

diff --git a/altosui/AltosDebug.java b/altosui/AltosDebug.java
index 23e38bc02f9df4f5896aad3a1d38341d39c7bb05..16b10c3af2b07bf278a59f20952723ef2e8fb57b 100644 (file)
--- a/altosui/AltosDebug.java
+++ b/altosui/AltosDebug.java
@@ -17,13 +17,7 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.*;
-import java.util.*;
-import org.altusmetrum.AltosLib.*;
-
-import libaltosJNI.*;
 
 public class AltosDebug extends AltosSerial {
 

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 2fe7d5443cb554a981aa58a0a490bf8d59ed936a..e9ff590b735e6d79dbec25187ad421426bd9f8f0 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,15 +18,7 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {

diff --git a/altosui/AltosDevice.java b/altosui/AltosDevice.java
index 1b5c1a91bf76ec83b52d13bab659855b0eb7a310..d1bc5fd72b72816dd15ca3d008672aafff9133fc 100644 (file)
--- a/altosui/AltosDevice.java
+++ b/altosui/AltosDevice.java
@@ -16,8 +16,6 @@
  */
 
 package altosui;
-import java.lang.*;
-import java.util.*;
 import libaltosJNI.*;
 
 public interface AltosDevice {

diff --git a/altosui/AltosDeviceDialog.java b/altosui/AltosDeviceDialog.java
index fa9d0013722ee88e5e48aa3df49e8bbe10bf16bd..0aeadae66d7cf4eb828a65f5db1621ec11917179 100644 (file)
--- a/altosui/AltosDeviceDialog.java
+++ b/altosui/AltosDeviceDialog.java
@@ -17,12 +17,9 @@
 
 package altosui;
 
-import java.lang.*;
-import java.util.*;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-import libaltosJNI.*;
 
 public class AltosDeviceDialog extends AltosDialog implements ActionListener {
 

diff --git a/altosui/AltosDialog.java b/altosui/AltosDialog.java
index ff38c3e47fe2c842f9dbe4820f7b0f9ff7ff5a4b..eac371aa2fde152f65382da3f15f8901c05ea2ce 100644 (file)
--- a/altosui/AltosDialog.java
+++ b/altosui/AltosDialog.java
@@ -20,16 +20,6 @@ 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 libaltosJNI.*;
 
 class AltosDialogListener extends WindowAdapter {
        public void windowClosing (WindowEvent e) {

diff --git a/altosui/AltosDisplayThread.java b/altosui/AltosDisplayThread.java
index cf69c414580e27bbbd56e05880a82017c93e1568..f7a1d03eb2ad7b1bfa0f9e8f6d6bc667eef23ddc 100644 (file)
--- a/altosui/AltosDisplayThread.java
+++ b/altosui/AltosDisplayThread.java
@@ -18,15 +18,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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosDisplayThread extends Thread {
@@ -228,7 +222,7 @@ public class AltosDisplayThread extends Thread {
 
        public void run() {
                boolean         interrupted = false;
-               String          line;
+               //String                line;
                AltosState      state = null;
                AltosState      old_state = null;
                boolean         told;

diff --git a/altosui/AltosEepromDelete.java b/altosui/AltosEepromDelete.java
index 73f3a00f06420dd571c61c826081304c34f3c840..b0459bb6154c8f7dd041efbdc58fd72b34e01c08 100644 (file)
--- a/altosui/AltosEepromDelete.java
+++ b/altosui/AltosEepromDelete.java
@@ -17,20 +17,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 libaltosJNI.*;
-
 public class AltosEepromDelete implements Runnable {
        AltosEepromList         flights;
        Thread                  eeprom_thread;

diff --git a/altosui/AltosEepromDownload.java b/altosui/AltosEepromDownload.java
index 65cac7bd75f67084e0259f5c73be023f820f1974..a8cb24ff0c287f670c255a5524a12ded19a8c524 100644 (file)
--- a/altosui/AltosEepromDownload.java
+++ b/altosui/AltosEepromDownload.java
@@ -17,20 +17,14 @@
 
 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 libaltosJNI.*;
-
 public class AltosEepromDownload implements Runnable {
 
        JFrame                  frame;
@@ -113,7 +107,7 @@ public class AltosEepromDownload implements Runnable {
 
                extension = "eeprom";
                set_serial(flights.config_data.serial);
-               for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
+               for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromRecord.record_length) {
                        try {
                                AltosEepromRecord r = new AltosEepromRecord(eechunk, i);
                                if (r.cmd == Altos.AO_LOG_FLIGHT)
@@ -220,7 +214,7 @@ public class AltosEepromDownload implements Runnable {
                boolean any_valid = false;
 
                extension = "science";
-               for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
+               for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromTeleScience.record_length) {
                        try {
                                AltosEepromTeleScience r = new AltosEepromTeleScience(eechunk, i);
                                if (r.type == AltosEepromTeleScience.AO_LOG_TELESCIENCE_START) {
@@ -273,7 +267,7 @@ public class AltosEepromDownload implements Runnable {
 
                extension = "mega";
                set_serial(flights.config_data.serial);
-               for (int i = 0; i < eechunk.chunk_size && !done; i += AltosEepromMega.record_length) {
+               for (int i = 0; i < AltosEepromChunk.chunk_size && !done; i += AltosEepromMega.record_length) {
                        try {
                                AltosEepromMega r = new AltosEepromMega(eechunk, i);
                                if (r.cmd == Altos.AO_LOG_FLIGHT)

diff --git a/altosui/AltosEepromList.java b/altosui/AltosEepromList.java
index 6a656215083796c2eaca6512a68c51b79626d06a..f9bd2748a79ca539ac5cc248a2bd486f663dcefc 100644 (file)
--- a/altosui/AltosEepromList.java
+++ b/altosui/AltosEepromList.java
@@ -17,20 +17,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 libaltosJNI.*;
-
 /*
  * Temporary structure to hold the list of stored flights;
  * each of these will be queried in turn to generate more

diff --git a/altosui/AltosEepromManage.java b/altosui/AltosEepromManage.java
index 563c90b3ce78dd0b81228854c9f74d112fda9fff..b8de77dabbc93721437defb51cbe24cc545d101e 100644 (file)
--- a/altosui/AltosEepromManage.java
+++ b/altosui/AltosEepromManage.java
@@ -17,20 +17,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 libaltosJNI.*;
-
 public class AltosEepromManage implements ActionListener {
 
        JFrame                  frame;
@@ -161,7 +153,7 @@ public class AltosEepromManage implements ActionListener {
                                                      ee.getLocalizedMessage(),
                                                      JOptionPane.ERROR_MESSAGE);
                } else if (e instanceof TimeoutException) {
-                       TimeoutException te = (TimeoutException) e;
+                       //TimeoutException te = (TimeoutException) e;
                        JOptionPane.showMessageDialog(frame,
                                                      String.format("Communications failed with \"%s\"",
                                                                    device.toShortString()),
@@ -202,7 +194,7 @@ public class AltosEepromManage implements ActionListener {
 
        public AltosEepromManage(JFrame given_frame) {
 
-               boolean running = false;
+               //boolean       running = false;
 
                frame = given_frame;
                device = AltosDeviceDialog.show(frame, Altos.product_any);

diff --git a/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java
index 75643442b1a374aa299b48963b81a147d3b8ec5f..251344e9c44e4cc16c3ad2fddeadf0d07d336d36 100644 (file)
--- a/altosui/AltosEepromMonitor.java
+++ b/altosui/AltosEepromMonitor.java
@@ -20,14 +20,6 @@ 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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosEepromMonitor extends AltosDialog {
 

diff --git a/altosui/AltosEepromSelect.java b/altosui/AltosEepromSelect.java
index 4ad78896b3445b4a100ec2cbd5cbb8256a8085cc..d8b8693d8762f22f4b43232edf440df5c381f661 100644 (file)
--- a/altosui/AltosEepromSelect.java
+++ b/altosui/AltosEepromSelect.java
@@ -17,16 +17,10 @@
 
 package altosui;
 
-import java.lang.*;
-import java.util.*;
 import javax.swing.*;
 import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
-import libaltosJNI.libaltos;
-import libaltosJNI.altos_device;
-import libaltosJNI.SWIGTYPE_p_altos_file;
-import libaltosJNI.SWIGTYPE_p_altos_list;
 import org.altusmetrum.AltosLib.*;
 
 class AltosEepromItem implements ActionListener {
@@ -57,7 +51,7 @@ class AltosEepromItem implements ActionListener {
 }
 
 public class AltosEepromSelect extends AltosDialog implements ActionListener {
-       private JList                   list;
+       //private JList                 list;
        private JFrame                  frame;
        JButton                         ok;
        JButton                         cancel;

diff --git a/altosui/AltosFlash.java b/altosui/AltosFlash.java
index bd0c8a5077057c5ea22da315312cdf99540abe75..313af70bd90258f600a000a73a0791e58be13c36 100644 (file)
--- a/altosui/AltosFlash.java
+++ b/altosui/AltosFlash.java
@@ -17,17 +17,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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosFlash {
        File            file;

diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 66991d1066df111eebb2d2987f12ac83809c8d7c..f8c24b16c662a2498cb6b4570f087461f9c198f5 100644 (file)
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -21,13 +21,8 @@ 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.*;
 
 public class AltosFlashUI
        extends AltosDialog
@@ -291,7 +286,7 @@ public class AltosFlashUI
                if (!select_source_file())
                        return;
                build_dialog();
-               flash_task      f = new flash_task(this);
+               //flash_task    f = new flash_task(this);
        }
 
        static void show(JFrame frame) {

diff --git a/altosui/AltosFlightInfoTableModel.java b/altosui/AltosFlightInfoTableModel.java
index 77969a89ffdfc3f727684a449f3fb150e9d13ac4..249f64976ef31d9e700c74dfee5cfa49f5f53911 100644 (file)
--- a/altosui/AltosFlightInfoTableModel.java
+++ b/altosui/AltosFlightInfoTableModel.java
@@ -17,17 +17,7 @@
 
 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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightInfoTableModel extends AbstractTableModel {
        final static private String[] columnNames = {"Field", "Value"};

diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java
index ab094c805d6e0d53ee7ef7ff2fe97854b87ba3f2..e48cb608189fa9d90f2fa2e4efbd60f21d0875fa 100644 (file)
--- a/altosui/AltosFlightStats.java
+++ b/altosui/AltosFlightStats.java
@@ -17,16 +17,7 @@
 
 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.*;
 
 public class AltosFlightStats {

diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java
index 87ba6aa8ae57f905ac225751a042c380551d9752..1e0b94fa34f60cc9d2314765d309a35a66f49fed 100644 (file)
--- a/altosui/AltosFlightStatsTable.java
+++ b/altosui/AltosFlightStatsTable.java
@@ -18,15 +18,7 @@
 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.*;
 
 public class AltosFlightStatsTable extends JComponent {

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index 6a351004b6ab6aa4b11e63f6a81dc2a935d91dd5..b97c8dc61e004024c9e38868805529a0a30595cc 100644 (file)
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -18,15 +18,7 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {

diff --git a/altosui/AltosFlightStatusTableModel.java b/altosui/AltosFlightStatusTableModel.java
index c2cf8cd1911a09d4723f7a872a5c0905e81e3e5d..56ad7e6f0d774f62e589f9565f76d3b66f5ac83b 100644 (file)
--- a/altosui/AltosFlightStatusTableModel.java
+++ b/altosui/AltosFlightStatusTableModel.java
@@ -14,7 +14,7 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
-
+/*
 package altosui;
 
 import java.awt.*;
@@ -65,3 +65,4 @@ public class AltosFlightStatusTableModel extends AbstractTableModel {
                setValueAt(String.format("%1.0f", AltosConvert.speed(speed)), 3);
        }
 }
+*/
\ No newline at end of file

diff --git a/altosui/AltosFlightStatusUpdate.java b/altosui/AltosFlightStatusUpdate.java
index d70fc7f87e618876eff6e0f3868b8834485bbb39..bef39e8d8c2613d15e7b96a1d8a3baf9b37a3a2a 100644 (file)
--- a/altosui/AltosFlightStatusUpdate.java
+++ b/altosui/AltosFlightStatusUpdate.java
@@ -17,16 +17,7 @@
 
 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.*;
 
 public class AltosFlightStatusUpdate implements ActionListener {

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 600d8acce428232f973e0ff4cef79c7bf13b7db7..533b1951f7c5cfdcb28840cc819d50c333a50e2a 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -20,12 +20,6 @@ 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.*;
 

diff --git a/altosui/AltosFrame.java b/altosui/AltosFrame.java
index 338b363ed0bc099dd107e5eaed27c8389bbf4f35..731a29b442cf4f6f16cfd4f248cf453bf25a053d 100644 (file)
--- a/altosui/AltosFrame.java
+++ b/altosui/AltosFrame.java
@@ -20,16 +20,7 @@ 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 libaltosJNI.*;
 
 class AltosFrameListener extends WindowAdapter {
        public void windowClosing (WindowEvent e) {

diff --git a/altosui/AltosFreqList.java b/altosui/AltosFreqList.java
index 1bbc97c6ce36d7b582b225c13d0a516e56015646..4edf088c5246acd2de2b775b3b2d7ed3b936a1ab 100644 (file)
--- a/altosui/AltosFreqList.java
+++ b/altosui/AltosFreqList.java
@@ -17,16 +17,7 @@
 
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosFreqList extends JComboBox {

diff --git a/altosui/AltosGraph.java b/altosui/AltosGraph.java
index 54d2bb0b7834bcb1a09dcbf4fbe55b62d7a27964..fbcefd61acd4f033c4038dcd7ed497c6bc830a36 100644 (file)
--- a/altosui/AltosGraph.java
+++ b/altosui/AltosGraph.java
@@ -8,7 +8,6 @@ import java.io.*;
 
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.ChartUtilities;
-import org.altusmetrum.AltosLib.*;
 
 abstract class AltosGraph {
     public String filename;

diff --git a/altosui/AltosGraphTime.java b/altosui/AltosGraphTime.java
index 0955f6e6e444883e07774bfdd1f9c9afb5f33f0c..75e536c583776e363693b5d3ff993aaf9b16893f 100644 (file)
--- a/altosui/AltosGraphTime.java
+++ b/altosui/AltosGraphTime.java
@@ -4,16 +4,10 @@
 
 package altosui;
 
-import java.lang.*;
-import java.io.*;
-import java.util.concurrent.*;
 import java.util.*;
-import java.text.*;
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.HashMap;
-import org.altusmetrum.AltosLib.*;
-
 import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
 import org.jfree.chart.axis.AxisLocation;

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index edde1307e17d60dc6bae8b1baa8ca3980987f4ae..cb8e3d2072595d0ef0dcd6f8659fc7e7abb058e3 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -8,17 +8,11 @@ import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import org.altusmetrum.AltosLib.*;
 
 import org.jfree.chart.ChartPanel;
-import org.jfree.chart.ChartUtilities;
 import org.jfree.chart.JFreeChart;
-import org.jfree.chart.axis.AxisLocation;
-import org.jfree.ui.ApplicationFrame;
 import org.jfree.ui.RefineryUtilities;
 
 public class AltosGraphUI extends AltosFrame 
@@ -28,9 +22,9 @@ public class AltosGraphUI extends AltosFrame
     static final private Color red = new Color(194,31,31);
     static final private Color green = new Color(31,194,31);
     static final private Color blue = new Color(31,31,194);
-    static final private Color black = new Color(31,31,31);
+    //static final private Color black = new Color(31,31,31);
     static final private Color yellow = new Color(194,194,31);
-    static final private Color cyan = new Color(31,194,194);
+    //static final private Color cyan = new Color(31,194,194);
     static final private Color magenta = new Color(194,31,194);
 
     static private class OverallGraphs {
@@ -100,7 +94,7 @@ public class AltosGraphUI extends AltosFrame
                 }
             };
     
-        AltosGraphTime.Element e_pad    = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad");
+        //AltosGraphTime.Element e_pad    = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad");
         AltosGraphTime.Element e_boost  = new AltosGraphTime.StateMarker(Altos.ao_flight_boost, "Boost");
         AltosGraphTime.Element e_fast   = new AltosGraphTime.StateMarker(Altos.ao_flight_fast, "Fast");
         AltosGraphTime.Element e_coast  = new AltosGraphTime.StateMarker(Altos.ao_flight_coast, "Coast");
@@ -149,7 +143,8 @@ public class AltosGraphUI extends AltosFrame
             return graphs;
         }
     }
-    
+
+    /*
     static private class AscentGraphs extends OverallGraphs {
         protected AltosGraphTime myAltosGraphTime(String suffix) {
             return (new AltosGraphTime("Ascent " + suffix) {
@@ -164,7 +159,9 @@ public class AltosGraphUI extends AltosFrame
               .addElement(e_coast);
         }
     }
-    
+    */
+
+    /*
     static private class DescentGraphs extends OverallGraphs {
         protected AltosGraphTime myAltosGraphTime(String suffix) {
             return (new AltosGraphTime("Descent " + suffix) {
@@ -179,13 +176,12 @@ public class AltosGraphUI extends AltosFrame
             // ((XYGraph)graph[8]).ymin = new Double(-50);
         }
     }
+    */
 
        public AltosGraphUI(AltosRecordIterable records, String name) throws InterruptedException, IOException {
                super(String.format("Altos Graph %s", name));
 
                AltosDataPointReader reader = new AltosDataPointReader (records);
-               if (reader == null)
-                       return;
         
                if (reader.has_accel)
                    init(reader, records, 0);
@@ -229,11 +225,13 @@ public class AltosGraphUI extends AltosFrame
         return createGraphsWhich(data, which).get(0);
     }
 
+    /*
     private static ArrayList<AltosGraph> createGraphs(
             Iterable<AltosDataPoint> data)
     {
         return createGraphsWhich(data, -1);
     }
+    */
 
     private static ArrayList<AltosGraph> createGraphsWhich(
             Iterable<AltosDataPoint> data, int which)

diff --git a/altosui/AltosHexfile.java b/altosui/AltosHexfile.java
index d52b46c3bcddd6f2623617d1e67d2c3eee40a370..56875f530715de2f313d13550ccca5fb8ea3d167 100644 (file)
--- a/altosui/AltosHexfile.java
+++ b/altosui/AltosHexfile.java
@@ -17,13 +17,9 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
-import java.util.Iterator;
 import java.util.Arrays;
-import org.altusmetrum.AltosLib.*;
 
 class HexFileInputStream extends PushbackInputStream {
        public int line;
@@ -48,7 +44,7 @@ class HexFileInputStream extends PushbackInputStream {
        }
 }
 
-class HexRecord implements Comparable {
+class HexRecord implements Comparable<Object> {
        public int      address;
        public int      type;
        public byte     checksum;

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 510579c5973c56ab05255c9630513c89eb618856..6f69600997c6ab0d0bac505c01ecc85b5254f30e 100644 (file)
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -20,12 +20,7 @@ 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.*;
 

diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index 78eba8e66bec1d9473c951335a82455e5edf6371..ec331259c73531d69946bdd1e00fe341e041bde5 100644 (file)
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -20,13 +20,8 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
 import java.io.*;
-import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 

diff --git a/altosui/AltosInfoTable.java b/altosui/AltosInfoTable.java
index c14009767447debd51491dfe1f6a1d449b4253ef..86e02ab1ddcbe07733f6063fefc44086f6d4fdc1 100644 (file)
--- a/altosui/AltosInfoTable.java
+++ b/altosui/AltosInfoTable.java
@@ -18,15 +18,8 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosInfoTable extends JTable {
@@ -92,9 +85,9 @@ public class AltosInfoTable extends JTable {
        }
 
        void info_add_deg(int col, String name, double v, int pos, int neg) {
-               int     c = pos;
+               //int   c = pos;
                if (v < 0) {
-                       c = neg;
+                       //c = neg;
                        v = -v;
                }
                double  deg = Math.floor(v);
@@ -152,6 +145,7 @@ public class AltosInfoTable extends JTable {
                        info_add_row(1, "GPS height", "%6.0f", state.gps_height);
 
                        /* The SkyTraq GPS doesn't report these values */
+                       /*
                        if (false) {
                                info_add_row(1, "GPS ground speed", "%8.1f m/s %3d°",
                                             state.gps.ground_speed,
@@ -161,6 +155,8 @@ public class AltosInfoTable extends JTable {
                                info_add_row(1, "GPS error", "%6d m(h)%3d m(v)",
                                             state.gps.h_error, state.gps.v_error);
                        }
+                       */
+
                        info_add_row(1, "GPS hdop", "%8.1f", state.gps.hdop);
 
                        if (state.npad > 0) {
@@ -191,7 +187,7 @@ public class AltosInfoTable extends JTable {
                                       state.gps.hour,
                                       state.gps.minute,
                                       state.gps.second);
-                       int     nsat_vis = 0;
+                       //int   nsat_vis = 0;
                        int     c;
 
                        if (state.gps.cc_gps_sat == null)

diff --git a/altosui/AltosKML.java b/altosui/AltosKML.java
index 73a5ae53d7474e21598c6184593cc350ac4814c4..57339b1962fd8dd87368817eee9680e361f64721 100644 (file)
--- a/altosui/AltosKML.java
+++ b/altosui/AltosKML.java
@@ -17,10 +17,7 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.text.*;
-import java.util.*;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosKML implements AltosWriter {

diff --git a/altosui/AltosLanded.java b/altosui/AltosLanded.java
index 68efae8d85ba6e6c1342d404983e9ea057440f3a..57c2d476989e9b5b50d1ff2701ea85d59a2d9ca1 100644 (file)
--- a/altosui/AltosLanded.java
+++ b/altosui/AltosLanded.java
@@ -20,13 +20,7 @@ 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosLanded extends JComponent implements AltosFlightDisplay, ActionListener {

diff --git a/altosui/AltosLaunch.java b/altosui/AltosLaunch.java
index 0e493b91363f9607e466a92650f9199462f171c8..de19221e9f0c117a29c7899ca07af2c0eba8eade 100644 (file)
--- a/altosui/AltosLaunch.java
+++ b/altosui/AltosLaunch.java
@@ -20,12 +20,6 @@ package altosui;
 import java.io.*;
 import java.util.concurrent.*;
 import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosLaunch {
        AltosDevice     device;

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 444815442de739d5a40b45f909599df9d07c8a82..39b986c0a129f0dde62a7533be54027bd9bb3ea9 100644 (file)
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.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 javax.swing.event.*;
 import java.io.*;
-import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
 
 class FireButton extends JButton {
        protected void processMouseEvent(MouseEvent e) {

diff --git a/altosui/AltosLed.java b/altosui/AltosLed.java
index 1358cd48161d43cbf4636861feb8879c5c1ff403..93064f1e4d82e414f4c79c4aabe00da5bc914ac0 100644 (file)
--- a/altosui/AltosLed.java
+++ b/altosui/AltosLed.java
@@ -17,17 +17,7 @@
 
 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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosLed extends JLabel {
        ImageIcon       on, off;

diff --git a/altosui/AltosLights.java b/altosui/AltosLights.java
index 8bd9e7de22c49fd47d466f0272864a0efa3447e8..7ad22f3ed04afae87ca828c7ab40aea67b2add99 100644 (file)
--- a/altosui/AltosLights.java
+++ b/altosui/AltosLights.java
@@ -18,16 +18,7 @@
 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.LinkedBlockingQueue;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosLights extends JComponent {
 

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 947c754080f7a7499f099c321fda0c3b918c9f16..2d9c832317845545b53ca303634732332faa8363 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -18,15 +18,7 @@
 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.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {

diff --git a/altosui/AltosRomconfig.java b/altosui/AltosRomconfig.java
index 0a283e510ef7567051d803bffeef75effde155c8..55056b5e521cff94803addea48d17d7e6f9c9277 100644 (file)
--- a/altosui/AltosRomconfig.java
+++ b/altosui/AltosRomconfig.java
@@ -17,7 +17,6 @@
 
 package altosui;
 import java.io.*;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosRomconfig {
        public boolean  valid;

diff --git a/altosui/AltosRomconfigUI.java b/altosui/AltosRomconfigUI.java
index 306b8623d4cc7e6079d85b43aede1d34317e2950..d4a5ef6dac33d65aee1407d0b905173d91ff9aed 100644 (file)
--- a/altosui/AltosRomconfigUI.java
+++ b/altosui/AltosRomconfigUI.java
@@ -20,14 +20,6 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosRomconfigUI
        extends AltosDialog

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 9da1290fd846d342a98ce93d7a2e1e1d92c0e519..2a6e140ac34f786e5f363b6a3c73ab949847c677 100644 (file)
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -20,13 +20,10 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index 6cee1609e1db5ba6815bc0a6fd7e7195e16861f1..771fdd5dfe14326ae5a30b29284a676eac024f13 100644 (file)
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -21,16 +21,10 @@
 
 package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.*;
 import java.util.*;
-import java.text.*;
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
 import org.altusmetrum.AltosLib.*;
 
 import libaltosJNI.*;

diff --git a/altosui/AltosSiteMap.java b/altosui/AltosSiteMap.java
index b57edcabd68e472b8ee19c1d4ec41b6bf6a55944..3ea4d0fd3548eb06bc296f35170739e7c0d22674 100644 (file)
--- a/altosui/AltosSiteMap.java
+++ b/altosui/AltosSiteMap.java
@@ -18,19 +18,10 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.lang.Math;
 import java.awt.geom.Point2D;
-import java.awt.geom.Line2D;
 import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 
@@ -61,11 +52,13 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        // based on google js
        //  http://maps.gstatic.com/intl/en_us/mapfiles/api-3/2/10/main.js
        // search for fromLatLngToPoint and fromPointToLatLng
+       /*
        private static Point2D.Double pt(LatLng latlng, int zoom) {
                double scale_x = 256/360.0 * Math.pow(2, zoom);
                double scale_y = 256/(2.0*Math.PI) * Math.pow(2, zoom);
                return pt(latlng, scale_x, scale_y);
        }
+       */
 
        private static Point2D.Double pt(LatLng latlng,
                                         double scale_x, double scale_y)
@@ -108,9 +101,11 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        private LatLng latlng(double x, double y) {
                return latlng(new Point2D.Double(x,y), scale_x, scale_y);
        }
+       /*
        private LatLng latlng(Point2D.Double pt) {
                return latlng(pt, scale_x, scale_y);
        }
+       */
 
        ConcurrentHashMap<Point,AltosSiteMapTile> mapTiles = new ConcurrentHashMap<Point,AltosSiteMapTile>();
        Point2D.Double centre;
@@ -190,8 +185,8 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
                AltosSiteMap asm = new AltosSiteMap(true);
                asm.centre = asm.getBaseLocation(lat, lng);
 
-               Point2D.Double p = new Point2D.Double();
-               Point2D.Double p2;
+               //Point2D.Double p = new Point2D.Double();
+               //Point2D.Double p2;
                int dx = -w/2, dy = -h/2;
                for (int y = dy; y < h+dy; y++) {
                        for (int x = dx; x < w+dx; x++) {
@@ -426,7 +421,7 @@ public class AltosSiteMap extends JScrollPane implements AltosFlightDisplay {
        public AltosSiteMap(int in_radius) {
                radius = in_radius;
 
-               GrabNDrag scroller = new GrabNDrag(comp);
+               //GrabNDrag scroller = new GrabNDrag(comp);
 
                comp.setLayout(layout);
 

diff --git a/altosui/AltosSiteMapCache.java b/altosui/AltosSiteMapCache.java
index f729a2984951c080c3b899436f35357bf37b0060..617ed4a9a3331193271b03f4dd4b56b6eb406eb3 100644 (file)
--- a/altosui/AltosSiteMapCache.java
+++ b/altosui/AltosSiteMapCache.java
@@ -17,19 +17,11 @@
 
 package altosui;
 
-import java.awt.*;
-import java.awt.image.*;
-import java.awt.event.*;
 import javax.swing.*;
 import javax.imageio.ImageIO;
-import javax.swing.table.*;
 import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.AltosLib.*;
 
 public class AltosSiteMapCache extends JLabel {
        public static boolean fetchMap(File file, String url) {

diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index 676b079054c569012110edd6fbfc57ab6a3da41a..33849c660bb1fa12124cd0bc6f89540883defa0c 100644 (file)
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -18,22 +18,14 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.image.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
 import java.io.*;
 import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.lang.Math;
-import java.awt.geom.Point2D;
-import java.awt.geom.Line2D;
 import java.net.URL;
 import java.net.URLConnection;
-import org.altusmetrum.AltosLib.*;
 
 class AltosMapPos extends Box {
        AltosUI         owner;
@@ -184,7 +176,7 @@ class AltosSites extends Thread {
        public void run() {
                try {
                        URLConnection uc = url.openConnection();
-                       int length = uc.getContentLength();
+                       //int length = uc.getContentLength();
                        
                        InputStreamReader in_stream = new InputStreamReader(uc.getInputStream(), Altos.unicode_set);
                        BufferedReader in = new BufferedReader(in_stream);

diff --git a/altosui/AltosSiteMapTile.java b/altosui/AltosSiteMapTile.java
index 345502199d94bb834091e3b190cfa9945e970b79..e9d4a20bde78efe475835a77099034849766f8aa 100644 (file)
--- a/altosui/AltosSiteMapTile.java
+++ b/altosui/AltosSiteMapTile.java
@@ -19,15 +19,7 @@ package altosui;
 
 import java.awt.*;
 import java.awt.image.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.lang.Math;
 import java.awt.geom.Point2D;
 import java.awt.geom.Line2D;
 import org.altusmetrum.AltosLib.*;

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index c1a66b835692c695f232f401a1030002602ee583..b5cbefe73a352ae78362c3d1c4679b5eef21a8c9 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -20,17 +20,10 @@ 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 libaltosJNI.*;
-
 public class AltosUI extends AltosFrame {
        public AltosVoice voice = new AltosVoice();
 
@@ -94,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);
@@ -448,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 {

diff --git a/altosui/AltosUIPreferences.java b/altosui/AltosUIPreferences.java
index 8f1e45d93e5e48116ac077fe4ef1d8cf6f54ed90..a026d12302a27af2beba13781f66b7aabb8709a2 100644 (file)
--- a/altosui/AltosUIPreferences.java
+++ b/altosui/AltosUIPreferences.java
@@ -19,12 +19,8 @@ package altosui;
 
 import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.awt.Component;
 import javax.swing.*;
-import javax.swing.filechooser.FileSystemView;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosUIPreferences extends AltosPreferences {

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
index ed5f8307d178bba720de462c47b358e3f4f4ddf4..3af7a7fa4895d952af6dd60328c91cb6cb90b187 100644 (file)
--- a/altosui/AltosUSBDevice.java
+++ b/altosui/AltosUSBDevice.java
@@ -16,7 +16,6 @@
  */
 
 package altosui;
-import java.lang.*;
 import java.util.*;
 import libaltosJNI.*;
 

diff --git a/altosui/AltosVoice.java b/altosui/AltosVoice.java
index ab74e0b3f8de562f372804f74fc9981d936be559..f84c11220393ba7ad7fcff1a7ec2f248a19c46b0 100644 (file)
--- a/altosui/AltosVoice.java
+++ b/altosui/AltosVoice.java
@@ -19,7 +19,6 @@ package altosui;
 
 import com.sun.speech.freetts.Voice;
 import com.sun.speech.freetts.VoiceManager;
-import com.sun.speech.freetts.audio.JavaClipAudioPlayer;
 import java.util.concurrent.LinkedBlockingQueue;
 
 public class AltosVoice implements Runnable {

diff --git a/altosui/AltosWriter.java b/altosui/AltosWriter.java
index b7375204d0a41ffb7bca233441f78adf4ffada38..6806c50e89682ff261c1f1476f1dce88ac408883 100644 (file)
--- a/altosui/AltosWriter.java
+++ b/altosui/AltosWriter.java
@@ -17,10 +17,6 @@
 
 package altosui;
 
-import java.lang.*;
-import java.io.*;
-import java.text.*;
-import java.util.*;
 import org.altusmetrum.AltosLib.*;
 
 

diff --git a/altosui/GrabNDrag.java b/altosui/GrabNDrag.java
index c350efec01e3f149a508d1d80370b54c17341ec8..2fd6c4daffc5bccac4bd0e1df798e48a6785d9e8 100644 (file)
--- a/altosui/GrabNDrag.java
+++ b/altosui/GrabNDrag.java
@@ -18,16 +18,9 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.image.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.MouseInputAdapter;
-import javax.imageio.ImageIO;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import org.altusmetrum.AltosLib.*;
 
 class GrabNDrag extends MouseInputAdapter {
        private JComponent scroll;