altosui/altosuilib: Cleanup -Xlint:unchecked warnings
[fw/altos] / altosui / AltosScanUI.java
index e188834e64aa76a204d8026a42324273b800c29a..5cc74a7796b6a91cad6068b1d6ff3f0f3938b05d 100644 (file)
@@ -20,14 +20,13 @@ 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_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
 class AltosScanResult {
        String          callsign;
@@ -35,9 +34,9 @@ class AltosScanResult {
        int             flight;
        AltosFrequency  frequency;
        int             telemetry;
-       
+
        boolean interrupted = false;
-       
+
        public String toString() {
                return String.format("%-9.9s serial %-4d flight %-4d (%s %s)",
                                     callsign, serial, flight, frequency.toShortString(), Altos.telemetry_name(telemetry));
@@ -58,36 +57,57 @@ class AltosScanResult {
        }
 
        public boolean equals(AltosScanResult other) {
-               return (callsign.equals(other.callsign) &&
-                       serial == other.serial &&
-                       flight == other.flight &&
+               return (serial == other.serial &&
                        frequency.frequency == other.frequency.frequency &&
                        telemetry == other.telemetry);
        }
+
+       public boolean up_to_date(AltosScanResult other) {
+               if (flight == 0 && other.flight != 0) {
+                       flight = other.flight;
+                       return false;
+               }
+               if (callsign.equals("N0CALL") && !other.callsign.equals("N0CALL")) {
+                       callsign = other.callsign;
+                       return false;
+               }
+               return true;
+       }
 }
 
-class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel {
-       
+class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel<AltosScanResult> {
+
        LinkedList<ListDataListener>    listeners = new LinkedList<ListDataListener>();
 
+       void changed(ListDataEvent de) {
+               for (ListDataListener l : listeners)
+                       l.contentsChanged(de);
+       }
+
        public boolean add(AltosScanResult r) {
-               for (AltosScanResult old : this)
-                       if (old.equals(r))
+               int i = 0;
+               for (AltosScanResult old : this) {
+                       if (old.equals(r)) {
+                               if (!old.up_to_date(r))
+                                       changed (new ListDataEvent(this,
+                                                                  ListDataEvent.CONTENTS_CHANGED,
+                                                                  i, i));
                                return true;
+                       }
+                       i++;
+               }
 
                super.add(r);
-               ListDataEvent   de = new ListDataEvent(this,
-                                                      ListDataEvent.INTERVAL_ADDED,
-                                                      this.size() - 2, this.size() - 1);
-               for (ListDataListener l : listeners)
-                       l.contentsChanged(de);
+               changed(new ListDataEvent(this,
+                                         ListDataEvent.INTERVAL_ADDED,
+                                         this.size() - 2, this.size() - 1));
                return true;
        }
 
        public void addListDataListener(ListDataListener l) {
                listeners.add(l);
        }
-       
+
        public void removeListDataListener(ListDataListener l) {
                listeners.remove(l);
        }
@@ -102,14 +122,14 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-       extends AltosDialog
+       extends AltosUIDialog
        implements ActionListener
 {
        AltosUI                         owner;
        AltosDevice                     device;
        AltosConfigData                 config_data;
        AltosTelemetryReader            reader;
-       private JList                   list;
+       private JList<AltosScanResult>  list;
        private JLabel                  scanning_label;
        private JLabel                  frequency_label;
        private JLabel                  telemetry_label;
@@ -164,13 +184,13 @@ public class AltosScanUI
                        try {
                                for (;;) {
                                        try {
-                                               AltosRecord     record = reader.read();
-                                               if (record == null)
+                                               AltosState      state = reader.read();
+                                               if (state == null)
                                                        continue;
-                                               if ((record.seen & AltosRecord.seen_flight) != 0) {
-                                                       final AltosScanResult   result = new AltosScanResult(record.callsign,
-                                                                                                    record.serial,
-                                                                                                    record.flight,
+                                               if (state.flight != AltosLib.MISSING) {
+                                                       final AltosScanResult   result = new AltosScanResult(state.callsign,
+                                                                                                    state.serial,
+                                                                                                    state.flight,
                                                                                                     frequencies[frequency_index],
                                                                                                     telemetry);
                                                        Runnable r = new Runnable() {
@@ -201,13 +221,14 @@ public class AltosScanUI
        void set_telemetry() {
                reader.set_telemetry(telemetry);
        }
-       
+
        void set_frequency() throws InterruptedException, TimeoutException {
                reader.set_frequency(frequencies[frequency_index].frequency);
+               reader.reset();
        }
-       
+
        void next() throws InterruptedException, TimeoutException {
-               reader.serial.set_monitor(false);
+               reader.set_monitor(false);
                Thread.sleep(100);
                ++frequency_index;
                if (frequency_index >= frequencies.length ||
@@ -223,7 +244,7 @@ public class AltosScanUI
                }
                set_frequency();
                set_label();
-               reader.serial.set_monitor(true);
+               reader.set_monitor(true);
        }
 
 
@@ -267,7 +288,7 @@ public class AltosScanUI
                                        scanning_telemetry |= (1 << Altos.ao_telemetry_standard);
                                        telemetry_boxes[Altos.ao_telemetry_standard - Altos.ao_telemetry_min].setSelected(true);
                                }
-                               AltosPreferences.set_scanning_telemetry(scanning_telemetry);
+                               AltosUIPreferences.set_scanning_telemetry(scanning_telemetry);
                        }
 
                        if (cmd.equals("monitor")) {
@@ -307,11 +328,11 @@ public class AltosScanUI
        }
 
        private boolean open() {
-               device = AltosDeviceDialog.show(owner, Altos.product_basestation);
+               device = AltosDeviceUIDialog.show(owner, Altos.product_basestation);
                if (device == null)
                        return false;
                try {
-                       reader = new AltosTelemetryReader(device);
+                       reader = new AltosTelemetryReader(new AltosSerial(device));
                        set_frequency();
                        set_telemetry();
                        try {
@@ -359,7 +380,7 @@ public class AltosScanUI
 
                owner = in_owner;
 
-               frequencies = AltosPreferences.common_frequencies();
+               frequencies = AltosUIPreferences.common_frequencies();
                frequency_index = 0;
                telemetry = Altos.ao_telemetry_min;
 
@@ -381,7 +402,7 @@ public class AltosScanUI
                scanning_label = new JLabel("Scanning:");
                frequency_label = new JLabel("");
                telemetry_label = new JLabel("");
-               
+
                set_label();
 
                c.fill = GridBagConstraints.HORIZONTAL;
@@ -400,11 +421,11 @@ public class AltosScanUI
                c.gridy = 2;
                pane.add(telemetry_label, c);
 
-               int     scanning_telemetry = AltosPreferences.scanning_telemetry();
+               int     scanning_telemetry = AltosUIPreferences.scanning_telemetry();
                telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
                for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
                        int j = k - Altos.ao_telemetry_min;
-                       telemetry_boxes[j] = new JCheckBox(Altos.ao_telemetry_name[k]);
+                       telemetry_boxes[j] = new JCheckBox(AltosLib.telemetry_name(k));
                        c.gridy = 3 + j;
                        pane.add(telemetry_boxes[j], c);
                        telemetry_boxes[j].setActionCommand("telemetry");
@@ -413,8 +434,8 @@ public class AltosScanUI
                }
 
                int     y_offset = 3 + (Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1);
-                               
-               list = new JList(results) {
+
+               list = new JList<AltosScanResult>(results) {
                                //Subclass JList to workaround bug 4832765, which can cause the
                                //scroll pane to not let the user easily scroll up to the beginning
                                //of the list.  An alternative would be to set the unitIncrement
@@ -527,4 +548,4 @@ public class AltosScanUI
 
                setVisible(true);
        }
-}
\ No newline at end of file
+}