summaryrefslogtreecommitdiff
path: root/altosui/AltosFreqList.java
diff options
context:
space:
mode:
authorBdale Garbee <bdale@gag.com>2013-12-19 01:38:40 -0700
committerBdale Garbee <bdale@gag.com>2013-12-19 01:38:40 -0700
commit575bbaf976c5840fd0e308549c45a466fdec1352 (patch)
tree11bfb498348bf7687bffc24699c4b1a998988ee4 /altosui/AltosFreqList.java
parentb825116df173b77e2cab217a7b76112c742f9279 (diff)
parentbc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3 (diff)
Merge branch 'branch-1.3' into debian
Conflicts: ChangeLog altoslib/AltosRecordMM.java altosui/Makefile.am altosui/altos-windows.nsi.in configure.ac debian/changelog debian/control doc/Makefile doc/altusmetrum.xsl doc/release-notes-1.2.1.xsl doc/release-notes-1.2.xsl
Diffstat (limited to 'altosui/AltosFreqList.java')
-rw-r--r--altosui/AltosFreqList.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/altosui/AltosFreqList.java b/altosui/AltosFreqList.java
index 7464ac3e..17a995d4 100644
--- a/altosui/AltosFreqList.java
+++ b/altosui/AltosFreqList.java
@@ -18,7 +18,7 @@
package altosui;
import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosFreqList extends JComboBox {
@@ -29,6 +29,12 @@ public class AltosFreqList extends JComboBox {
public void set_frequency(double new_frequency) {
int i;
+
+ if (new_frequency < 0) {
+ setVisible(false);
+ return;
+ }
+
for (i = 0; i < getItemCount(); i++) {
AltosFrequency f = (AltosFrequency) getItemAt(i);