Merge remote-tracking branch 'mjb/altosui_mjb'

[fw/altos] / altosui / AltosHexfile.java

diff --git a/altosui/AltosHexfile.java b/altosui/AltosHexfile.java
index 435f13ee3545e741dc53ecc87c91183915040b6c..56875f530715de2f313d13550ccca5fb8ea3d167 100644 (file)
--- a/altosui/AltosHexfile.java
+++ b/altosui/AltosHexfile.java
@@ -15,15 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+package altosui;
 
-import java.lang.*;
 import java.io.*;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.LinkedList;
-import java.util.Iterator;
 import java.util.Arrays;
-import org.altusmetrum.AltosLib.*;
 
 class HexFileInputStream extends PushbackInputStream {
        public int line;
@@ -48,7 +44,7 @@ class HexFileInputStream extends PushbackInputStream {
        }
 }
 
-class HexRecord implements Comparable {
+class HexRecord implements Comparable<Object> {
        public int      address;
        public int      type;
        public byte     checksum;