X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosLaunchUI.java;h=4c205d44db7448fe0f63f817fabe5af2add21d6a;hp=4e630afb11045477fff135c42d32f19bc16f51c0;hb=356617a3476e237311b8bbcefd6beda8271b120d;hpb=4568bc796a6c362ebf7f72ee9a5fa4a9a3c4ba6a

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 4e630afb..4c205d44 100644
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -20,14 +20,10 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import javax.swing.event.*;
 import java.io.*;
-import java.util.*;
 import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altosuilib_6.*;
 
 class FireButton extends JButton {
 	protected void processMouseEvent(MouseEvent e) {
@@ -50,7 +46,7 @@ class FireButton extends JButton {
 }
 
 public class AltosLaunchUI
-	extends JDialog
+	extends AltosUIDialog
 	implements ActionListener
 {
 	AltosDevice	device;
@@ -164,8 +160,7 @@ public class AltosLaunchUI
 	void launch_exception(Exception e) {
 		if (e instanceof FileNotFoundException) {
 			JOptionPane.showMessageDialog(owner,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ((FileNotFoundException) e).getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} else if (e instanceof AltosSerialInUseException) {
@@ -317,7 +312,7 @@ public class AltosLaunchUI
 	void set_serial() {
 		try {
 			launcher_serial = Integer.parseInt(launcher_serial_text.getText());
-			AltosPreferences.set_launcher_serial(launcher_serial);
+			AltosUIPreferences.set_launcher_serial(launcher_serial);
 			send_command("set_remote");
 		} catch (NumberFormatException ne) {
 			launcher_serial_text.setText(String.format("%d", launcher_serial));
@@ -327,7 +322,7 @@ public class AltosLaunchUI
 	void set_channel() {
 		try {
 			launcher_channel = Integer.parseInt(launcher_channel_text.getText());
-			AltosPreferences.set_launcher_serial(launcher_channel);
+			AltosUIPreferences.set_launcher_serial(launcher_channel);
 			send_command("set_remote");
 		} catch (NumberFormatException ne) {
 			launcher_channel_text.setText(String.format("%d", launcher_channel));
@@ -336,7 +331,6 @@ public class AltosLaunchUI
 
 	public void actionPerformed(ActionEvent e) {
 		String cmd = e.getActionCommand();
-		System.out.printf("cmd %s\n", cmd);
 		if (cmd.equals("armed") || cmd.equals("igniter")) {
 			stop_arm_timer();
 		}
@@ -377,7 +371,7 @@ public class AltosLaunchUI
 	private boolean open() {
 		command_queue = new LinkedBlockingQueue<String>();
 
-		device = AltosDeviceDialog.show(owner, Altos.product_any);
+		device = AltosDeviceUIDialog.show(owner, Altos.product_any);
 		if (device != null) {
 				LaunchHandler	handler = new LaunchHandler(owner);
 				Thread		t = new Thread(handler);
@@ -389,8 +383,8 @@ public class AltosLaunchUI
 
 	public AltosLaunchUI(JFrame in_owner) {
 
-		launcher_channel = AltosPreferences.launcher_channel();
-		launcher_serial = AltosPreferences.launcher_serial();
+		launcher_channel = AltosUIPreferences.launcher_channel();
+		launcher_serial = AltosUIPreferences.launcher_serial();
 		owner = in_owner;
 		armed_status = AltosLaunch.Unknown;
 		igniter_status = AltosLaunch.Unknown;