summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-11-13 15:19:14 -0800
committerKeith Packard <keithp@keithp.com>2010-11-13 15:19:14 -0800
commit8463ffcaca6bcd31e645aba71c171f548dce96d8 (patch)
tree2e8e59cfec68096996f4594ac0538b80ceebfc86
parenta6f30fae906bd87dff192c5fd4d10df283f99930 (diff)
altosui: Eliminate unncessary import altosui lines
Java appears to automatically import every module from the current package. Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--ao-tools/altosui/AltosCSVUI.java3
-rw-r--r--ao-tools/altosui/AltosConfig.java14
-rw-r--r--ao-tools/altosui/AltosConfigUI.java13
-rw-r--r--ao-tools/altosui/AltosDataPointReader.java5
-rw-r--r--ao-tools/altosui/AltosDebug.java2
-rw-r--r--ao-tools/altosui/AltosDeviceDialog.java1
-rw-r--r--ao-tools/altosui/AltosEepromDownload.java12
-rw-r--r--ao-tools/altosui/AltosEepromIterable.java8
-rw-r--r--ao-tools/altosui/AltosEepromMonitor.java10
-rw-r--r--ao-tools/altosui/AltosEepromRecord.java11
-rw-r--r--ao-tools/altosui/AltosFile.java2
-rw-r--r--ao-tools/altosui/AltosFlash.java2
-rw-r--r--ao-tools/altosui/AltosFlashUI.java3
-rw-r--r--ao-tools/altosui/AltosGPS.java2
-rw-r--r--ao-tools/altosui/AltosGraph.java2
-rw-r--r--ao-tools/altosui/AltosGraphDataChooser.java5
-rw-r--r--ao-tools/altosui/AltosGraphTime.java3
-rw-r--r--ao-tools/altosui/AltosGraphUI.java3
-rw-r--r--ao-tools/altosui/AltosGreatCircle.java2
-rw-r--r--ao-tools/altosui/AltosInfoTable.java3
-rw-r--r--ao-tools/altosui/AltosLog.java3
-rw-r--r--ao-tools/altosui/AltosParse.java2
-rw-r--r--ao-tools/altosui/AltosReader.java2
-rw-r--r--ao-tools/altosui/AltosRecord.java2
-rw-r--r--ao-tools/altosui/AltosRecordIterable.java8
-rw-r--r--ao-tools/altosui/AltosRomconfig.java1
-rw-r--r--ao-tools/altosui/AltosRomconfigUI.java2
-rw-r--r--ao-tools/altosui/AltosSerial.java9
-rw-r--r--ao-tools/altosui/AltosState.java3
-rw-r--r--ao-tools/altosui/AltosStatusTable.java3
-rw-r--r--ao-tools/altosui/AltosTelemetry.java4
-rw-r--r--ao-tools/altosui/AltosTelemetryIterable.java1
-rw-r--r--ao-tools/altosui/AltosUI.java19
33 files changed, 2 insertions, 163 deletions
diff --git a/ao-tools/altosui/AltosCSVUI.java b/ao-tools/altosui/AltosCSVUI.java
index eb620ba8..16f25338 100644
--- a/ao-tools/altosui/AltosCSVUI.java
+++ b/ao-tools/altosui/AltosCSVUI.java
@@ -28,9 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosLogfileChooser;
-import altosui.AltosCSV;
-
public class AltosCSVUI
extends JDialog
implements Runnable, ActionListener
diff --git a/ao-tools/altosui/AltosConfig.java b/ao-tools/altosui/AltosConfig.java
index b7474f3b..30f7d541 100644
--- a/ao-tools/altosui/AltosConfig.java
+++ b/ao-tools/altosui/AltosConfig.java
@@ -28,20 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosFlightStatusTableModel;
-import altosui.AltosFlightInfoTableModel;
-import altosui.AltosConfigUI;
-
import libaltosJNI.*;
public class AltosConfig implements Runnable, ActionListener {
diff --git a/ao-tools/altosui/AltosConfigUI.java b/ao-tools/altosui/AltosConfigUI.java
index 37128573..9e3856b0 100644
--- a/ao-tools/altosui/AltosConfigUI.java
+++ b/ao-tools/altosui/AltosConfigUI.java
@@ -29,19 +29,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosFlightStatusTableModel;
-import altosui.AltosFlightInfoTableModel;
-
import libaltosJNI.*;
public class AltosConfigUI
diff --git a/ao-tools/altosui/AltosDataPointReader.java b/ao-tools/altosui/AltosDataPointReader.java
index 4d7831e4..7704310b 100644
--- a/ao-tools/altosui/AltosDataPointReader.java
+++ b/ao-tools/altosui/AltosDataPointReader.java
@@ -10,11 +10,6 @@ import java.lang.UnsupportedOperationException;
import java.util.NoSuchElementException;
import java.util.Iterator;
-import altosui.AltosDataPoint;
-import altosui.AltosRecordIterable;
-import altosui.AltosRecord;
-import altosui.AltosState;
-
class AltosDataPointReader implements Iterable<AltosDataPoint> {
Iterator<AltosRecord> iter;
AltosState state;
diff --git a/ao-tools/altosui/AltosDebug.java b/ao-tools/altosui/AltosDebug.java
index 3f469d48..9c10129d 100644
--- a/ao-tools/altosui/AltosDebug.java
+++ b/ao-tools/altosui/AltosDebug.java
@@ -22,8 +22,6 @@ import java.io.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.LinkedList;
import java.util.Iterator;
-import altosui.AltosSerial;
-import altosui.AltosRomconfig;
public class AltosDebug extends AltosSerial {
diff --git a/ao-tools/altosui/AltosDeviceDialog.java b/ao-tools/altosui/AltosDeviceDialog.java
index ec78e288..2966ad1e 100644
--- a/ao-tools/altosui/AltosDeviceDialog.java
+++ b/ao-tools/altosui/AltosDeviceDialog.java
@@ -26,7 +26,6 @@ import libaltosJNI.libaltos;
import libaltosJNI.altos_device;
import libaltosJNI.SWIGTYPE_p_altos_file;
import libaltosJNI.SWIGTYPE_p_altos_list;
-import altosui.AltosDevice;
public class AltosDeviceDialog extends JDialog implements ActionListener {
diff --git a/ao-tools/altosui/AltosEepromDownload.java b/ao-tools/altosui/AltosEepromDownload.java
index 8efc94d2..bd9e4b48 100644
--- a/ao-tools/altosui/AltosEepromDownload.java
+++ b/ao-tools/altosui/AltosEepromDownload.java
@@ -28,18 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
import libaltosJNI.*;
public class AltosEepromDownload implements Runnable {
diff --git a/ao-tools/altosui/AltosEepromIterable.java b/ao-tools/altosui/AltosEepromIterable.java
index 2f1e7e90..fc683321 100644
--- a/ao-tools/altosui/AltosEepromIterable.java
+++ b/ao-tools/altosui/AltosEepromIterable.java
@@ -28,14 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosRecord;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
/*
* AltosRecords with an index field so they can be sorted by tick while preserving
* the original ordering for elements with matching ticks
diff --git a/ao-tools/altosui/AltosEepromMonitor.java b/ao-tools/altosui/AltosEepromMonitor.java
index b88fdd29..7ff00ead 100644
--- a/ao-tools/altosui/AltosEepromMonitor.java
+++ b/ao-tools/altosui/AltosEepromMonitor.java
@@ -28,16 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-
public class AltosEepromMonitor extends JDialog {
Container pane;
diff --git a/ao-tools/altosui/AltosEepromRecord.java b/ao-tools/altosui/AltosEepromRecord.java
index 95cbe015..5a673817 100644
--- a/ao-tools/altosui/AltosEepromRecord.java
+++ b/ao-tools/altosui/AltosEepromRecord.java
@@ -28,17 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
public class AltosEepromRecord {
public int cmd;
public int tick;
diff --git a/ao-tools/altosui/AltosFile.java b/ao-tools/altosui/AltosFile.java
index 7f65381f..06360572 100644
--- a/ao-tools/altosui/AltosFile.java
+++ b/ao-tools/altosui/AltosFile.java
@@ -20,8 +20,6 @@ package altosui;
import java.lang.*;
import java.io.File;
import java.util.*;
-import altosui.AltosTelemetry;
-import altosui.AltosPreferences;
class AltosFile extends File {
diff --git a/ao-tools/altosui/AltosFlash.java b/ao-tools/altosui/AltosFlash.java
index a3e431cd..25b4a06e 100644
--- a/ao-tools/altosui/AltosFlash.java
+++ b/ao-tools/altosui/AltosFlash.java
@@ -28,8 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosHexfile;
-
public class AltosFlash {
File file;
FileInputStream input;
diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 86f57a5f..70c8c549 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -28,9 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosHexfile;
-import altosui.AltosFlash;
-
public class AltosFlashUI
extends JDialog
implements Runnable, ActionListener
diff --git a/ao-tools/altosui/AltosGPS.java b/ao-tools/altosui/AltosGPS.java
index acb6fb2c..83821842 100644
--- a/ao-tools/altosui/AltosGPS.java
+++ b/ao-tools/altosui/AltosGPS.java
@@ -19,8 +19,6 @@ package altosui;
import java.lang.*;
import java.text.*;
-import altosui.AltosParse;
-
public class AltosGPS {
public class AltosGPSSat {
diff --git a/ao-tools/altosui/AltosGraph.java b/ao-tools/altosui/AltosGraph.java
index fa3b87c1..58c27979 100644
--- a/ao-tools/altosui/AltosGraph.java
+++ b/ao-tools/altosui/AltosGraph.java
@@ -9,8 +9,6 @@ import java.io.*;
import org.jfree.chart.JFreeChart;
import org.jfree.chart.ChartUtilities;
-import altosui.AltosDataPoint;
-
abstract class AltosGraph {
public String filename;
public abstract void addData(AltosDataPoint d);
diff --git a/ao-tools/altosui/AltosGraphDataChooser.java b/ao-tools/altosui/AltosGraphDataChooser.java
index caa14118..d128f4d5 100644
--- a/ao-tools/altosui/AltosGraphDataChooser.java
+++ b/ao-tools/altosui/AltosGraphDataChooser.java
@@ -27,11 +27,6 @@ import java.util.*;
import java.text.*;
import java.util.prefs.*;
-import altosui.AltosPreferences;
-import altosui.AltosDataPointReader;
-import altosui.AltosEepromIterable;
-import altosui.AltosTelemetryIterable;
-
public class AltosGraphDataChooser extends JFileChooser {
JFrame frame;
String filename;
diff --git a/ao-tools/altosui/AltosGraphTime.java b/ao-tools/altosui/AltosGraphTime.java
index ab01b888..a5451280 100644
--- a/ao-tools/altosui/AltosGraphTime.java
+++ b/ao-tools/altosui/AltosGraphTime.java
@@ -24,9 +24,6 @@ import org.jfree.data.xy.XYSeriesCollection;
import org.jfree.ui.RectangleAnchor;
import org.jfree.ui.TextAnchor;
-import altosui.AltosDataPoint;
-import altosui.AltosGraph;
-
class AltosGraphTime extends AltosGraph {
static interface Element {
void attachGraph(AltosGraphTime g);
diff --git a/ao-tools/altosui/AltosGraphUI.java b/ao-tools/altosui/AltosGraphUI.java
index 25643c76..908aa3b4 100644
--- a/ao-tools/altosui/AltosGraphUI.java
+++ b/ao-tools/altosui/AltosGraphUI.java
@@ -17,9 +17,6 @@ import org.jfree.chart.axis.AxisLocation;
import org.jfree.ui.ApplicationFrame;
import org.jfree.ui.RefineryUtilities;
-import altosui.AltosDataPoint;
-import altosui.AltosGraphTime;
-
public class AltosGraphUI extends JFrame
{
static final private Color red = new Color(194,31,31);
diff --git a/ao-tools/altosui/AltosGreatCircle.java b/ao-tools/altosui/AltosGreatCircle.java
index aa6ae3b9..fb1b6ab3 100644
--- a/ao-tools/altosui/AltosGreatCircle.java
+++ b/ao-tools/altosui/AltosGreatCircle.java
@@ -17,8 +17,6 @@
package altosui;
-import altosui.AltosGPS;
-
import java.lang.Math;
public class AltosGreatCircle {
diff --git a/ao-tools/altosui/AltosInfoTable.java b/ao-tools/altosui/AltosInfoTable.java
index 2f326e07..28924410 100644
--- a/ao-tools/altosui/AltosInfoTable.java
+++ b/ao-tools/altosui/AltosInfoTable.java
@@ -28,9 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosFlightInfoTableModel;
-import altosui.AltosState;
-
public class AltosInfoTable {
private Box box;
private JTable table[];
diff --git a/ao-tools/altosui/AltosLog.java b/ao-tools/altosui/AltosLog.java
index fed96c28..137147d5 100644
--- a/ao-tools/altosui/AltosLog.java
+++ b/ao-tools/altosui/AltosLog.java
@@ -22,9 +22,6 @@ import java.lang.*;
import java.util.*;
import java.text.ParseException;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosSerial;
-import altosui.AltosFile;
-import altosui.AltosLine;
/*
* This creates a thread to capture telemetry data and write it to
diff --git a/ao-tools/altosui/AltosParse.java b/ao-tools/altosui/AltosParse.java
index 4d82de78..fbfcaaee 100644
--- a/ao-tools/altosui/AltosParse.java
+++ b/ao-tools/altosui/AltosParse.java
@@ -20,8 +20,6 @@ package altosui;
import java.text.*;
import java.lang.*;
-import altosui.Altos;
-
public class AltosParse {
static boolean isdigit(char c) {
return '0' <= c && c <= '9';
diff --git a/ao-tools/altosui/AltosReader.java b/ao-tools/altosui/AltosReader.java
index 5be8795d..b9280a0c 100644
--- a/ao-tools/altosui/AltosReader.java
+++ b/ao-tools/altosui/AltosReader.java
@@ -21,8 +21,6 @@ import java.io.*;
import java.util.*;
import java.text.*;
-import altosui.AltosRecord;
-
public class AltosReader {
public AltosRecord read() throws IOException, ParseException { return null; }
public void close() { }
diff --git a/ao-tools/altosui/AltosRecord.java b/ao-tools/altosui/AltosRecord.java
index 00484767..1160a273 100644
--- a/ao-tools/altosui/AltosRecord.java
+++ b/ao-tools/altosui/AltosRecord.java
@@ -21,8 +21,6 @@ import java.lang.*;
import java.text.*;
import java.util.HashMap;
import java.io.*;
-import altosui.AltosConvert;
-import altosui.AltosGPS;
public class AltosRecord {
int version;
diff --git a/ao-tools/altosui/AltosRecordIterable.java b/ao-tools/altosui/AltosRecordIterable.java
index 147ecc14..a7df92d1 100644
--- a/ao-tools/altosui/AltosRecordIterable.java
+++ b/ao-tools/altosui/AltosRecordIterable.java
@@ -28,14 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosRecord;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosEepromMonitor;
-
public abstract class AltosRecordIterable implements Iterable<AltosRecord> {
public abstract Iterator<AltosRecord> iterator();
public void write_comments(PrintStream out) { }
diff --git a/ao-tools/altosui/AltosRomconfig.java b/ao-tools/altosui/AltosRomconfig.java
index 22d2dbd3..55056b5e 100644
--- a/ao-tools/altosui/AltosRomconfig.java
+++ b/ao-tools/altosui/AltosRomconfig.java
@@ -17,7 +17,6 @@
package altosui;
import java.io.*;
-import altosui.AltosHexfile;
public class AltosRomconfig {
public boolean valid;
diff --git a/ao-tools/altosui/AltosRomconfigUI.java b/ao-tools/altosui/AltosRomconfigUI.java
index 2134975d..e1dc974e 100644
--- a/ao-tools/altosui/AltosRomconfigUI.java
+++ b/ao-tools/altosui/AltosRomconfigUI.java
@@ -28,8 +28,6 @@ import java.util.*;
import java.text.*;
import java.util.prefs.*;
-import altosui.AltosRomconfig;
-
public class AltosRomconfigUI
extends JDialog
implements ActionListener
diff --git a/ao-tools/altosui/AltosSerial.java b/ao-tools/altosui/AltosSerial.java
index d6848e57..6787e0c8 100644
--- a/ao-tools/altosui/AltosSerial.java
+++ b/ao-tools/altosui/AltosSerial.java
@@ -26,13 +26,8 @@ import java.io.*;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.LinkedList;
import java.util.Iterator;
-import altosui.AltosSerialMonitor;
-import altosui.AltosLine;
-import libaltosJNI.libaltos;
-import libaltosJNI.altos_device;
-import libaltosJNI.SWIGTYPE_p_altos_file;
-import libaltosJNI.SWIGTYPE_p_altos_list;
-import libaltosJNI.libaltosConstants;
+
+import libaltosJNI.*;
/*
* This class reads from the serial port and places each received
diff --git a/ao-tools/altosui/AltosState.java b/ao-tools/altosui/AltosState.java
index 86eb636a..ec499d5a 100644
--- a/ao-tools/altosui/AltosState.java
+++ b/ao-tools/altosui/AltosState.java
@@ -21,9 +21,6 @@
package altosui;
-import altosui.AltosRecord;
-import altosui.AltosGPS;
-
public class AltosState {
AltosRecord data;
diff --git a/ao-tools/altosui/AltosStatusTable.java b/ao-tools/altosui/AltosStatusTable.java
index 0d3a5d14..02c6232f 100644
--- a/ao-tools/altosui/AltosStatusTable.java
+++ b/ao-tools/altosui/AltosStatusTable.java
@@ -28,9 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.AltosFlightStatusTableModel;
-import altosui.AltosFlightInfoTableModel;
-
public class AltosStatusTable extends JTable {
private AltosFlightStatusTableModel flightStatusModel;
diff --git a/ao-tools/altosui/AltosTelemetry.java b/ao-tools/altosui/AltosTelemetry.java
index be22dac6..bdb6466a 100644
--- a/ao-tools/altosui/AltosTelemetry.java
+++ b/ao-tools/altosui/AltosTelemetry.java
@@ -20,10 +20,6 @@ package altosui;
import java.lang.*;
import java.text.*;
import java.util.HashMap;
-import altosui.AltosConvert;
-import altosui.AltosRecord;
-import altosui.AltosGPS;
-import altosui.AltosCRCException;
/*
* Telemetry data contents
diff --git a/ao-tools/altosui/AltosTelemetryIterable.java b/ao-tools/altosui/AltosTelemetryIterable.java
index 0a125c98..a71ab872 100644
--- a/ao-tools/altosui/AltosTelemetryIterable.java
+++ b/ao-tools/altosui/AltosTelemetryIterable.java
@@ -20,7 +20,6 @@ package altosui;
import java.io.*;
import java.util.*;
import java.text.*;
-import altosui.AltosTelemetry;
public class AltosTelemetryIterable extends AltosRecordIterable {
LinkedList<AltosRecord> records;
diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 2861444d..9ab451de 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -28,25 +28,6 @@ import java.text.*;
import java.util.prefs.*;
import java.util.concurrent.LinkedBlockingQueue;
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosFlightInfoTableModel;
-import altosui.AltosFlashUI;
-import altosui.AltosLogfileChooser;
-import altosui.AltosCSVUI;
-import altosui.AltosLine;
-import altosui.AltosStatusTable;
-import altosui.AltosInfoTable;
-import altosui.AltosDisplayThread;
-
import libaltosJNI.*;
public class AltosUI extends JFrame {