Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / altosui / AltosConfigFreqUI.java

diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index d68151ecc9b797234efe03585a5c2df30ea16e35..4f8bd0f25318e161166c21333133a39ec3387c22 100644 (file)
--- a/altosui/AltosConfigFreqUI.java
+++ b/altosui/AltosConfigFreqUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package altosui;
+package AltosUI;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -29,8 +29,9 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
-class AltosEditFreqUI extends JDialog implements ActionListener {
+class AltosEditFreqUI extends AltosDialog implements ActionListener {
        Frame           frame;
        JTextField      frequency;
        JTextField      description;
@@ -165,7 +166,7 @@ class AltosEditFreqUI extends JDialog implements ActionListener {
        }
 }
 
-public class AltosConfigFreqUI extends JDialog implements ActionListener {
+public class AltosConfigFreqUI extends AltosDialog implements ActionListener {
 
        Frame frame;
        LinkedList<ActionListener> listeners;
@@ -177,9 +178,9 @@ public class AltosConfigFreqUI extends JDialog implements ActionListener {
                        int i;
                        for (i = 0; i < list_model.size(); i++) {
                                AltosFrequency  f = (AltosFrequency) list_model.get(i);
-                               if (f.frequency == frequency.frequency)
+                               if (frequency.frequency == f.frequency)
                                        return;
-                               if (f.frequency > frequency.frequency)
+                               if (frequency.frequency < f.frequency)
                                        break;
                        }
                        list_model.insertElementAt(frequency, i);
@@ -246,7 +247,7 @@ public class AltosConfigFreqUI extends JDialog implements ActionListener {
        FrequencyList   frequencies;
 
        void save_frequencies() {
-               AltosPreferences.set_common_frequencies(frequencies.frequencies());
+               AltosUIPreferences.set_common_frequencies(frequencies.frequencies());
        }
 
        JButton add, edit, remove;
@@ -411,7 +412,7 @@ public class AltosConfigFreqUI extends JDialog implements ActionListener {
                Frame   frame = JOptionPane.getFrameForComponent(frameComp);
                AltosConfigFreqUI       dialog;
 
-               dialog = new AltosConfigFreqUI(frame, AltosPreferences.common_frequencies());
+               dialog = new AltosConfigFreqUI(frame, AltosUIPreferences.common_frequencies());
                dialog.setVisible(true);
        }