X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigFreqUI.java;h=663782f0dc23906882770d341ea8dd6692aaafc7;hp=75101e3d57164f4356a97366fbfd3ae285eec155;hb=4ac7797d3efb9cc2d9fae88519f55e40b1050224;hpb=f0bbd3e2571336b5f5872759b5010148325efbaa

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index 75101e3d..663782f0 100644
--- 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.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
 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);