altosuilib: Track open frames, exit when none remain

This will let us not have the altosui window open by causing the
application to shut down when the last frame closes.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 32b59977d2a6ecc49e56e9272b8a7b23837a4542..4f394d73fb932a617bc62a806e7b1ab313640768 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -100,8 +100,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
                addWindowListener(new WindowAdapter() {
                                @Override
                                public void windowClosing(WindowEvent e) {
-                                       setVisible(false);
-                                       dispose();
                                        AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
                                        AltosPreferences.unregister_units_listener(AltosGraphUI.this);
                                }

diff --git a/altosuilib/AltosUIFrame.java b/altosuilib/AltosUIFrame.java
index 05266f8d70fb83c4893f50a3981ddfdcaad53e56..ac440190b69e8ec3c47a38f8a963a5599589b20a 100644 (file)
--- a/altosuilib/AltosUIFrame.java
+++ b/altosuilib/AltosUIFrame.java
@@ -23,8 +23,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 +268,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 */