X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosSerial.java;h=9b2180baf6fea2a2ee1f4db343f9ae0155cbe350;hp=b85a7fa1d4bf3e19984290d9cab4a0180a40006f;hb=02e657e45e217dc483a81f28020cfe65a826e9be;hpb=b1ffdaf1f5e9b6e8ff0d4e08d8c504f8dfacd3a4

diff --git a/altosui/AltosSerial.java b/altosui/AltosSerial.java
index b85a7fa1..9b2180ba 100644
--- a/altosui/AltosSerial.java
+++ b/altosui/AltosSerial.java
@@ -25,8 +25,8 @@ import java.io.*;
 import java.util.*;
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 import libaltosJNI.*;
 
@@ -146,7 +146,7 @@ public class AltosSerial extends AltosLink  {
 			try {
 				input_thread.interrupt();
 				input_thread.join();
-			} catch (InterruptedException e) {
+			} catch (InterruptedException ie) {
 			}
 			input_thread = null;
 		}
@@ -156,18 +156,16 @@ public class AltosSerial extends AltosLink  {
 
 	private void putc(char c) {
 		if (altos != null)
-			if (libaltos.altos_putchar(altos, c) != 0) {
+			if (libaltos.altos_putchar(altos, c) != 0)
 				close_serial();
-			}
 	}
 
 	public void putchar(byte c) {
 		if (altos != null) {
 			if (debug)
 				System.out.printf(" %02x", (int) c & 0xff);
-			if (libaltos.altos_putchar(altos, (char) c) != 0) {
+			if (libaltos.altos_putchar(altos, (char) c) != 0)
 				close_serial();
-			}
 		}
 	}