projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos: Clean up trailing whitespace in ao_pad.c
[fw/altos]
/
altosui
/
AltosConfigFreqUI.java
diff --git
a/altosui/AltosConfigFreqUI.java
b/altosui/AltosConfigFreqUI.java
index d68151ecc9b797234efe03585a5c2df30ea16e35..5877805791ec28ef7f81859a2dbb226fd2df6fc6 100644
(file)
--- a/
altosui/AltosConfigFreqUI.java
+++ b/
altosui/AltosConfigFreqUI.java
@@
-20,17
+20,11
@@
package altosui;
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
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.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
-class AltosEditFreqUI extends
J
Dialog implements ActionListener {
+class AltosEditFreqUI extends
AltosUI
Dialog implements ActionListener {
Frame frame;
JTextField frequency;
JTextField description;
Frame frame;
JTextField frequency;
JTextField description;
@@
-77,7
+71,7
@@
class AltosEditFreqUI extends JDialog implements ActionListener {
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets (4,4,4,4);
GridBagConstraints c = new GridBagConstraints();
c.insets = new Insets (4,4,4,4);
-
+
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.WEST;
c.gridx = 0;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.WEST;
c.gridx = 0;
@@
-132,7
+126,7
@@
class AltosEditFreqUI extends JDialog implements ActionListener {
c.weightx = 0;
c.weighty = 0;
pane.add(ok_button, c);
c.weightx = 0;
c.weighty = 0;
pane.add(ok_button, c);
-
+
cancel_button = new JButton("Cancel");
cancel_button.setActionCommand("cancel");
cancel_button.addActionListener(this);
cancel_button = new JButton("Cancel");
cancel_button.setActionCommand("cancel");
cancel_button.addActionListener(this);
@@
-145,7
+139,7
@@
class AltosEditFreqUI extends JDialog implements ActionListener {
c.weightx = 0;
c.weighty = 0;
pane.add(cancel_button, c);
c.weightx = 0;
c.weighty = 0;
pane.add(cancel_button, c);
-
+
if (existing == null)
setTitle("Add New Frequency");
else {
if (existing == null)
setTitle("Add New Frequency");
else {
@@
-157,7
+151,7
@@
class AltosEditFreqUI extends JDialog implements ActionListener {
pack();
setLocationRelativeTo(frame);
pack();
setLocationRelativeTo(frame);
-
+
}
public AltosEditFreqUI(Frame in_frame) {
}
public AltosEditFreqUI(Frame in_frame) {
@@
-165,7
+159,7
@@
class AltosEditFreqUI extends JDialog implements ActionListener {
}
}
}
}
-public class AltosConfigFreqUI extends
J
Dialog implements ActionListener {
+public class AltosConfigFreqUI extends
AltosUI
Dialog implements ActionListener {
Frame frame;
LinkedList<ActionListener> listeners;
Frame frame;
LinkedList<ActionListener> listeners;
@@
-177,9
+171,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);
int i;
for (i = 0; i < list_model.size(); i++) {
AltosFrequency f = (AltosFrequency) list_model.get(i);
- if (f
.frequency == frequency
.frequency)
+ if (f
requency.frequency == f
.frequency)
return;
return;
- if (f
.frequency > frequency
.frequency)
+ if (f
requency.frequency < f
.frequency)
break;
}
list_model.insertElementAt(frequency, i);
break;
}
list_model.insertElementAt(frequency, i);
@@
-246,7
+240,7
@@
public class AltosConfigFreqUI extends JDialog implements ActionListener {
FrequencyList frequencies;
void save_frequencies() {
FrequencyList frequencies;
void save_frequencies() {
- AltosPreferences.set_common_frequencies(frequencies.frequencies());
+ Altos
UI
Preferences.set_common_frequencies(frequencies.frequencies());
}
JButton add, edit, remove;
}
JButton add, edit, remove;
@@
-296,7
+290,7
@@
public class AltosConfigFreqUI extends JDialog implements ActionListener {
public AltosFrequency[] frequencies() {
return frequencies.frequencies();
}
public AltosFrequency[] frequencies() {
return frequencies.frequencies();
}
-
+
public AltosConfigFreqUI(Frame in_frame,
AltosFrequency[] in_frequencies) {
super(in_frame, "Manage Frequencies", true);
public AltosConfigFreqUI(Frame in_frame,
AltosFrequency[] in_frequencies) {
super(in_frame, "Manage Frequencies", true);
@@
-411,7
+405,7
@@
public class AltosConfigFreqUI extends JDialog implements ActionListener {
Frame frame = JOptionPane.getFrameForComponent(frameComp);
AltosConfigFreqUI dialog;
Frame frame = JOptionPane.getFrameForComponent(frameComp);
AltosConfigFreqUI dialog;
- dialog = new AltosConfigFreqUI(frame, AltosPreferences.common_frequencies());
+ dialog = new AltosConfigFreqUI(frame, Altos
UI
Preferences.common_frequencies());
dialog.setVisible(true);
}
dialog.setVisible(true);
}