altos: get ao_max6691 driver working

[fw/altos] / altosuilib / AltosUIFrame.java

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 3f74bca65004326172b7ade140e75fa91e218355..301bdc68de43c65b75afac2334240f00cbfbf9ea 100644 (file)
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_7;
+package org.altusmetrum.altosuilib_13;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,8 +24,13 @@ import javax.swing.*;
 import java.util.*;
 
 class AltosUIFrameListener extends WindowAdapter {
+       @Override
        public void windowClosing (WindowEvent e) {
-               AltosUIPreferences.unregister_ui_listener((AltosUIFrame) e.getWindow());
+               AltosUIFrame frame = (AltosUIFrame) e.getWindow();
+               AltosUIPreferences.unregister_ui_listener(frame);
+               AltosUIFrame.frame_closed();
+               frame.setVisible(false);
+               frame.dispose();
        }
 }
 
@@ -263,10 +269,23 @@ public class AltosUIFrame extends JFrame implements AltosUIListener, AltosPositi
                return constraints(x, width, GridBagConstraints.NONE);
        }
 
+       static int open_frames;
+
+       public static void frame_opened() {
+               ++open_frames;
+       }
+
+       public static void frame_closed() {
+               --open_frames;
+               if (open_frames == 0)
+                       System.exit(0);
+       }
+
        void init() {
                AltosUIPreferences.register_ui_listener(this);
                AltosUIPreferences.register_position_listener(this);
                position = AltosUIPreferences.position();
+               frame_opened();
                addWindowListener(new AltosUIFrameListener());
 
                /* Try to make menus live in the menu bar like regular Mac apps */