X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosLaunchUI.java;h=444815442de739d5a40b45f909599df9d07c8a82;hb=621d0930244f25165d2ac5da596dcc87e253b965;hp=73fae16bf23ca3df1351cdacec507674c0048ba6;hpb=7ecde50fbebe68a2e2200a2f8d081fd37074f840;p=fw%2Faltos

diff --git a/altosui/AltosLaunchUI.java b/altosui/AltosLaunchUI.java
index 73fae16b..44481544 100644
--- a/altosui/AltosLaunchUI.java
+++ b/altosui/AltosLaunchUI.java
@@ -28,6 +28,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.AltosLib.*;
 
 class FireButton extends JButton {
 	protected void processMouseEvent(MouseEvent e) {
@@ -316,7 +317,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));
@@ -326,7 +327,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));
@@ -335,7 +336,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();
 		}
@@ -388,8 +388,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;