altosui: Use shared AltosUIFrame and AltosUIDialog

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

21 files changed, 31 insertions, 152 deletions

diff --git a/altosui/AltosBTManage.java b/altosui/AltosBTManage.java
index 9a28d72b..b7b632a7 100644
--- a/altosui/AltosBTManage.java
+++ b/altosui/AltosBTManage.java
@@ -23,8 +23,9 @@ import javax.swing.*;
 import javax.swing.plaf.basic.*;
 import java.util.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altosuilib.*;
 
-public class AltosBTManage extends AltosDialog implements ActionListener, Iterable<AltosBTDevice> {
+public class AltosBTManage extends AltosUIDialog implements ActionListener, Iterable<AltosBTDevice> {
 	LinkedBlockingQueue<AltosBTDevice> found_devices;
 	Frame frame;
 	LinkedList<ActionListener> listeners;
diff --git a/altosui/AltosCSVUI.java b/altosui/AltosCSVUI.java
index 1d024086..83bf16a7 100644
--- a/altosui/AltosCSVUI.java
+++ b/altosui/AltosCSVUI.java
@@ -22,9 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosCSVUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	JFileChooser		csv_chooser;
diff --git a/altosui/AltosConfigFreqUI.java b/altosui/AltosConfigFreqUI.java
index 918748f7..75101e3d 100644
--- a/altosui/AltosConfigFreqUI.java
+++ b/altosui/AltosConfigFreqUI.java
@@ -22,8 +22,9 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.util.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
-class AltosEditFreqUI extends AltosDialog implements ActionListener {
+class AltosEditFreqUI extends AltosUIDialog implements ActionListener {
 	Frame		frame;
 	JTextField	frequency;
 	JTextField	description;
@@ -158,7 +159,7 @@ class AltosEditFreqUI extends AltosDialog implements ActionListener {
 	}
 }
 
-public class AltosConfigFreqUI extends AltosDialog implements ActionListener {
+public class AltosConfigFreqUI extends AltosUIDialog implements ActionListener {
 
 	Frame frame;
 	LinkedList<ActionListener> listeners;
diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index 17adb15f..5cdaf564 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -22,9 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosConfigPyroUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ItemListener, DocumentListener
 {
 	AltosConfigUI	owner;
diff --git a/altosui/AltosConfigTDUI.java b/altosui/AltosConfigTDUI.java
index 532a49fa..54073843 100644
--- a/altosui/AltosConfigTDUI.java
+++ b/altosui/AltosConfigTDUI.java
@@ -22,9 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosConfigTDUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener, ItemListener, DocumentListener
 {
 
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index 95780e2b..599ed051 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -22,9 +22,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosConfigUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener, ItemListener, DocumentListener, AltosConfigValues
 {
 
diff --git a/altosui/AltosDialog.java b/altosui/AltosDialog.java
deleted file mode 100644
index c2a9d6e6..00000000
--- a/altosui/AltosDialog.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-class AltosDialogListener extends WindowAdapter {
-	public void windowClosing (WindowEvent e) {
-		AltosUIPreferences.unregister_ui_listener((AltosDialog) e.getWindow());
-	}
-}
-
-public class AltosDialog extends JDialog implements AltosUIListener {
-
-	public void ui_changed(String look_and_feel) {
-		SwingUtilities.updateComponentTreeUI(this);
-		this.pack();
-	}
-
-	public AltosDialog() {
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosDialogListener());
-	}
-
-	public AltosDialog(Frame frame, String label, boolean modal) {
-		super(frame, label, modal);
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosDialogListener());
-	}
-
-	public AltosDialog(Dialog dialog, String label, boolean modal) {
-		super(dialog, label, modal);
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosDialogListener());
-	}
-
-	public AltosDialog(Frame frame, boolean modal) {
-		super(frame, modal);
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosDialogListener());
-	}
-}
diff --git a/altosui/AltosEepromMonitor.java b/altosui/AltosEepromMonitor.java
index 251344e9..8eae5eb8 100644
--- a/altosui/AltosEepromMonitor.java
+++ b/altosui/AltosEepromMonitor.java
@@ -20,8 +20,9 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import org.altusmetrum.altosuilib.*;
 
-public class AltosEepromMonitor extends AltosDialog {
+public class AltosEepromMonitor extends AltosUIDialog {
 
 	Container	pane;
 	Box		box;
diff --git a/altosui/AltosEepromSelect.java b/altosui/AltosEepromSelect.java
index d8b8693d..c0886212 100644
--- a/altosui/AltosEepromSelect.java
+++ b/altosui/AltosEepromSelect.java
@@ -22,6 +22,7 @@ import javax.swing.border.*;
 import java.awt.*;
 import java.awt.event.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 class AltosEepromItem implements ActionListener {
 	AltosEepromLog	log;
@@ -50,7 +51,7 @@ class AltosEepromItem implements ActionListener {
 	}
 }
 
-public class AltosEepromSelect extends AltosDialog implements ActionListener {
+public class AltosEepromSelect extends AltosUIDialog implements ActionListener {
 	//private JList			list;
 	private JFrame			frame;
 	JButton				ok;
diff --git a/altosui/AltosFlashUI.java b/altosui/AltosFlashUI.java
index 878150f6..921207bc 100644
--- a/altosui/AltosFlashUI.java
+++ b/altosui/AltosFlashUI.java
@@ -26,7 +26,7 @@ import java.util.concurrent.*;
 import org.altusmetrum.altosuilib.*;
 
 public class AltosFlashUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	Container	pane;
diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 604ea658..e2dc06bd 100644
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -24,7 +24,7 @@ import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 import org.altusmetrum.altosuilib.*;
 
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
 	AltosVoice		voice;
 	AltosFlightReader	reader;
 	AltosDisplayThread	thread;
diff --git a/altosui/AltosFrame.java b/altosui/AltosFrame.java
deleted file mode 100644
index 731a29b4..00000000
--- a/altosui/AltosFrame.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright © 2011 Keith Packard <keithp@keithp.com>
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import java.util.*;
-
-class AltosFrameListener extends WindowAdapter {
-	public void windowClosing (WindowEvent e) {
-		AltosUIPreferences.unregister_ui_listener((AltosFrame) e.getWindow());
-	}
-}
-
-public class AltosFrame extends JFrame implements AltosUIListener {
-
-	public void ui_changed(String look_and_feel) {
-		SwingUtilities.updateComponentTreeUI(this);
-		this.pack();
-	}
-
-	static final String[] icon_names = {
-		"/altus-metrum-16.png",
-		"/altus-metrum-32.png",
-		"/altus-metrum-48.png",
-		"/altus-metrum-64.png",
-		"/altus-metrum-128.png",
-		"/altus-metrum-256.png"
-	};
-
-	public void set_icon() {
-		ArrayList<Image> icons = new ArrayList<Image>();
-		
-		for (int i = 0; i < icon_names.length; i++) {
-			java.net.URL imgURL = AltosUI.class.getResource(icon_names[i]);
-			if (imgURL != null)
-				icons.add(new ImageIcon(imgURL).getImage());
-		}
-
-		setIconImages(icons);
-	}
-			
-	public AltosFrame() {
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosFrameListener());
-		set_icon();
-	}
-
-	public AltosFrame(String name) {
-		super(name);
-		AltosUIPreferences.register_ui_listener(this);
-		addWindowListener(new AltosFrameListener());
-		set_icon();
-	}
-}
diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index b7c2e92e..d6891ffa 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -10,12 +10,13 @@ import java.util.ArrayList;
 import java.awt.*;
 import javax.swing.*;
 import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altosuilib.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.ui.RefineryUtilities;
 
-public class AltosGraphUI extends AltosFrame 
+public class AltosGraphUI extends AltosUIFrame 
 {
     JTabbedPane	pane;
 
diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 6d3450b6..1b3dd547 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -25,7 +25,7 @@ import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 import org.altusmetrum.altosuilib.*;
 
-public class AltosIdleMonitorUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
diff --git a/altosui/AltosIgniteUI.java b/altosui/AltosIgniteUI.java
index f1742203..c1378eb9 100644
--- a/altosui/AltosIgniteUI.java
+++ b/altosui/AltosIgniteUI.java
@@ -27,7 +27,7 @@ import org.altusmetrum.AltosLib.*;
 import org.altusmetrum.altosuilib.*;
 
 public class AltosIgniteUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosDevice	device;
diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 68c978dc..7e7ed010 100644
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -46,7 +46,7 @@ class FireButton extends JButton {
 }
 
 public class AltosLaunchUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosDevice	device;
diff --git a/altosui/AltosRomconfigUI.java b/altosui/AltosRomconfigUI.java
index d4a5ef6d..5fc786e2 100644
--- a/altosui/AltosRomconfigUI.java
+++ b/altosui/AltosRomconfigUI.java
@@ -20,9 +20,10 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
+import org.altusmetrum.altosuilib.*;
 
 public class AltosRomconfigUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	Container	pane;
diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 6a8db0e0..14b52310 100644
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -122,7 +122,7 @@ class AltosScanResults extends LinkedList<AltosScanResult> implements ListModel
 }
 
 public class AltosScanUI
-	extends AltosDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosUI				owner;
diff --git a/altosui/AltosSiteMapPreload.java b/altosui/AltosSiteMapPreload.java
index 33849c66..f4dcc903 100644
--- a/altosui/AltosSiteMapPreload.java
+++ b/altosui/AltosSiteMapPreload.java
@@ -26,6 +26,7 @@ import java.text.*;
 import java.lang.Math;
 import java.net.URL;
 import java.net.URLConnection;
+import org.altusmetrum.altosuilib.*;
 
 class AltosMapPos extends Box {
 	AltosUI		owner;
@@ -205,7 +206,7 @@ class AltosSites extends Thread {
 	}
 }
 
-public class AltosSiteMapPreload extends AltosDialog implements ActionListener, ItemListener {
+public class AltosSiteMapPreload extends AltosUIDialog implements ActionListener, ItemListener {
 	AltosUI		owner;
 	AltosSiteMap	map;
 
diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index a385b8b3..70142a93 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -25,7 +25,7 @@ import java.util.concurrent.*;
 import org.altusmetrum.AltosLib.*;
 import org.altusmetrum.altosuilib.*;
 
-public class AltosUI extends AltosFrame {
+public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 1bd98c1c..368233d1 100644
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -6,7 +6,7 @@ man_MANS=altosui.1
 
 altoslibdir=$(libdir)/altos
 
-CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="./*:$(JAVAROOT):../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
+CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH="$(JAVAROOT):./*:../libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar"
 
 bin_SCRIPTS=altosui
 
@@ -76,8 +76,6 @@ altosui_JAVA = \
 	AltosSiteMapTile.java \
 	AltosUI.java \
 	AltosUIListener.java \
-	AltosFrame.java \
-	AltosDialog.java \
 	AltosWriter.java \
 	AltosDataPointReader.java \
 	AltosDataPoint.java \