altosui: remove un-used import

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 664c5ea662ec1439d58cada5a60336325f7a844c..61709afe0e769aaae0333819b1b2c21d6f4c1413 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,15 +18,7 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
 import org.altusmetrum.AltosLib.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
@@ -119,6 +111,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setVisible(false);
                }
 
+               void show(AltosUnits units, double v) {
+                       value.setText(units.show(8, v));
+               }
+
                void show(String format, double v) {
                        value.setText(String.format(format, v));
                }
@@ -239,7 +235,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Height extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.height);
+                       show(AltosConvert.height, state.height);
                }
                public Height (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Height");
@@ -253,7 +249,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        double speed = state.speed;
                        if (!state.ascent)
                                speed = state.baro_speed;
-                       show("%6.0f m/s", speed);
+                       show(AltosConvert.speed, speed);
                }
                public Speed (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Speed");
@@ -346,7 +342,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Range extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.range);
+                       show(AltosConvert.distance, state.range);
                }
                public Range (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Range");