altosui: Make Windows java test "smarter"

[fw/altos] / altosui / AltosConfigureUI.java

diff --git a/altosui/AltosConfigureUI.java b/altosui/AltosConfigureUI.java
index 5e42f43055ec55d9b13dabe3044f789d04693785..85a3f6c0d455954253486536e4abddf7b37a1f90 100644 (file)
--- a/altosui/AltosConfigureUI.java
+++ b/altosui/AltosConfigureUI.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosConfigureUI
        extends AltosUIConfigure
@@ -31,7 +31,7 @@ public class AltosConfigureUI
        AltosVoice      voice;
 
        public JTextField       callsign_value;
-       public JComboBox        position_value;
+       public JComboBox<String>        position_value;
 
        /* DocumentListener interface methods */
        public void insertUpdate(DocumentEvent e) {
@@ -89,6 +89,8 @@ public class AltosConfigureUI
                row++;
        }
 
+       boolean has_bluetooth;
+
        public void add_bluetooth() {
                JButton manage_bluetooth = new JButton("Manage Bluetooth");
                manage_bluetooth.addActionListener(new ActionListener() {
@@ -98,6 +100,7 @@ public class AltosConfigureUI
                        });
                pane.add(manage_bluetooth, constraints(0, 2));
                /* in the same row as add_frequencies, so don't bump row */
+               has_bluetooth = true;
        }
 
        public void add_frequencies() {
@@ -108,7 +111,10 @@ public class AltosConfigureUI
                                }
                        });
                manage_frequencies.setToolTipText("Configure which values are shown in frequency menus");
-               pane.add(manage_frequencies, constraints(2, 1));
+               if (has_bluetooth)
+                       pane.add(manage_frequencies, constraints(2, 1));
+               else
+                       pane.add(manage_frequencies, constraints(0, 3));
                row++;
        }
 
@@ -123,11 +129,11 @@ public class AltosConfigureUI
                "Bottom",
                "Bottom right",
        };
-               
+
        public void add_position() {
                pane.add(new JLabel ("Menu position"), constraints(0, 1));
-               
-               position_value = new JComboBox (position_names);
+
+               position_value = new JComboBox<String>(position_names);
                position_value.setMaximumRowCount(position_names.length);
                int position = AltosUIPreferences.position();
                position_value.setSelectedIndex(position);