telegps: Add device configuration dialogs

[fw/altos] / altosui / AltosConfigFreqUI.java

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index c90b168f3359ff236f368d08564f0d97e83f6dcd..c7181e1467a35c5a87a5a304ef5c33bc29887155 100644 (file)
--- a/altosui/AltosConfigFreqUI.java
+++ b/altosui/AltosConfigFreqUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
        Frame           frame;
@@ -71,7 +71,7 @@ class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
 
                GridBagConstraints c = new GridBagConstraints();
                c.insets = new Insets (4,4,4,4);
-               
+
                c.fill = GridBagConstraints.NONE;
                c.anchor = GridBagConstraints.WEST;
                c.gridx = 0;
@@ -126,7 +126,7 @@ class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
                c.weightx = 0;
                c.weighty = 0;
                pane.add(ok_button, c);
-               
+
                cancel_button = new JButton("Cancel");
                cancel_button.setActionCommand("cancel");
                cancel_button.addActionListener(this);
@@ -139,7 +139,7 @@ class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
                c.weightx = 0;
                c.weighty = 0;
                pane.add(cancel_button, c);
-               
+
                if (existing == null)
                        setTitle("Add New Frequency");
                else {
@@ -151,7 +151,7 @@ class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
 
                pack();
                setLocationRelativeTo(frame);
-               
+
        }
 
        public AltosEditFreqUI(Frame in_frame) {
@@ -164,8 +164,8 @@ public class AltosConfigFreqUI extends AltosUIDialog implements ActionListener {
        Frame frame;
        LinkedList<ActionListener> listeners;
 
-       class FrequencyList extends JList {
-               DefaultListModel list_model;
+       class FrequencyList extends JList<AltosFrequency> {
+               DefaultListModel<AltosFrequency> list_model;
 
                public void add(AltosFrequency frequency) {
                        int i;
@@ -226,7 +226,7 @@ public class AltosConfigFreqUI extends AltosUIDialog implements ActionListener {
                }
 
                public FrequencyList(AltosFrequency[] in_frequencies) {
-                       list_model = new DefaultListModel();
+                       list_model = new DefaultListModel<AltosFrequency>();
                        setModel(list_model);
                        setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
                        setLayoutOrientation(JList.HORIZONTAL_WRAP);
@@ -290,7 +290,7 @@ public class AltosConfigFreqUI extends AltosUIDialog implements ActionListener {
        public AltosFrequency[] frequencies() {
                return frequencies.frequencies();
        }
-       
+
        public AltosConfigFreqUI(Frame in_frame,
                                 AltosFrequency[] in_frequencies) {
                super(in_frame, "Manage Frequencies", true);