Bump java lib versions in preparation for 1.9.2

[fw/altos] / altosui / AltosConfigFCUI.java

diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java
index 1e875dec1aa9b490622fd0d2d371f306b43f0936..624c7246d91cdcca18e44266127c171872c2b34a 100644 (file)
--- a/altosui/AltosConfigFCUI.java
+++ b/altosui/AltosConfigFCUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import java.text.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosConfigFCUI
        extends AltosUIDialog
@@ -440,7 +440,7 @@ public class AltosConfigFCUI
                apogee_lockout_value.setEditable(true);
                apogee_lockout_value.addItemListener(this);
                pane.add(apogee_lockout_value, c);
-               apogee_lockout_value.setToolTipText("Time after boost while apogee detection is locked out");
+               apogee_lockout_value.setToolTipText("Time after launch while apogee detection is locked out");
                row++;
 
                /* Frequency */
@@ -1427,20 +1427,29 @@ public class AltosConfigFCUI
                return pyro_firing_time;
        }
 
+       private String aprs_interval_string(int interval) {
+               if (interval == 0)
+                       return "Disabled";
+               return Integer.toString(interval);
+       }
+
+       private int aprs_interval_value(String interval) throws AltosConfigDataException {
+               if (interval.equalsIgnoreCase("Disabled"))
+                       return 0;
+               return parse_int("aprs interval", interval, false);
+       }
+
        public void set_aprs_interval(int new_aprs_interval) {
                if (new_aprs_interval != AltosLib.MISSING)
-                       aprs_interval_value.setSelectedItem(Integer.toString(new_aprs_interval));
+                       aprs_interval_value.setSelectedItem(aprs_interval_string(new_aprs_interval));
                aprs_interval_value.setVisible(new_aprs_interval != AltosLib.MISSING);
                aprs_interval_label.setVisible(new_aprs_interval != AltosLib.MISSING);
                set_aprs_interval_tool_tip();
        }
 
        public int aprs_interval() throws AltosConfigDataException {
-               if (aprs_interval_value.isVisible()) {
-                       String  s = aprs_interval_value.getSelectedItem().toString();
-
-                       return parse_int("aprs interval", s, false);
-               }
+               if (aprs_interval_value.isVisible())
+                       return aprs_interval_value(aprs_interval_value.getSelectedItem().toString());
                return AltosLib.MISSING;
        }