altos: Remove pdclib bits from Makefile

[fw/altos] / altosuilib / AltosUIAccelCal.java

diff --git a/altosuilib/AltosUIAccelCal.java b/altosuilib/AltosUIAccelCal.java
index ea1869d0ff7a89d9de0f0924274f6d901ad5c214..e2c917b1bed94596e059cda80abec2660eed2e13 100644 (file)
--- a/altosuilib/AltosUIAccelCal.java
+++ b/altosuilib/AltosUIAccelCal.java
@@ -16,14 +16,14 @@
  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-package org.altusmetrum.altosuilib_12;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altoslib_13.*;
 
 public class AltosUIAccelCal
        extends AltosUIDialog
@@ -44,7 +44,6 @@ public class AltosUIAccelCal
        int accel_plus, accel_minus;
 
        private void make_visible() {
-               System.out.printf("Make calibration dialog visible\n");
                pack();
                cal.start();
                setVisible(true);
@@ -68,6 +67,10 @@ public class AltosUIAccelCal
                return AltosLib.MISSING;
        }
 
+       private void setDefaultButton(JButton button) {
+               this.getRootPane().setDefaultButton(button);
+       }
+
        /* AltosAccelCalListener interface */
        public void set_thread(AltosAccelCal cal, Thread thread) {
                this.thread = thread;
@@ -80,6 +83,7 @@ public class AltosUIAccelCal
                                        case AltosAccelCal.phase_antenna_up:
                                                message.setText("Orient antenna upwards and click on Antenna Up");
                                                antenna_up.setEnabled(true);
+                                               setDefaultButton(antenna_up);
                                                antenna_down.setEnabled(false);
                                                ok.setEnabled(false);
                                                break;
@@ -87,6 +91,7 @@ public class AltosUIAccelCal
                                                message.setText("Orient antenna downwards and click on Antenna Down");
                                                antenna_up.setEnabled(false);
                                                antenna_down.setEnabled(true);
+                                               setDefaultButton(antenna_down);
                                                ok.setEnabled(false);
                                                break;
                                        }
@@ -104,6 +109,7 @@ public class AltosUIAccelCal
                                        antenna_up.setEnabled(false);
                                        antenna_down.setEnabled(false);
                                        ok.setEnabled(true);
+                                       setDefaultButton(ok);
                                }
                        });
        }
@@ -130,11 +136,11 @@ public class AltosUIAccelCal
                } else if ("down".equals(cmd)) {
                        cal.signal(true);
                        antenna_down.setEnabled(false);
+                       this.setDefaultButton(antenna_down);
                } else if ("ok".equals(cmd)) {
                        cal.signal(true);
                        this.setVisible(false);
                        if (success) {
-                               System.out.printf("set accel cal to %d/%d\n", accel_plus, accel_minus);
                                config_values.set_accel_cal(accel_plus, accel_minus);
                                config_values.set_dirty();
                        }