altosui: Fix TeleBT name in flight monitor title
authorKeith Packard <keithp@keithp.com>
Tue, 26 Apr 2011 04:26:21 +0000 (21:26 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 26 Apr 2011 04:26:21 +0000 (21:26 -0700)
Was getting the product number, not the product name.

Signed-off-by: Keith Packard <keithp@keithp.com>
altosui/AltosBTDevice.java

index c2721b262c0df0b83a0a23a9a20900e961d3d80a..7a876c25feae21ee3a56d2a4ccae372ddfd4e50b 100644 (file)
@@ -58,19 +58,13 @@ public class AltosBTDevice extends altos_bt_device implements AltosDevice {
        }
 
        public String toString() {
        }
 
        public String toString() {
-               String  name = getName();
-               if (name == null)
-                       name = "Altus Metrum";
                return String.format("%-20.20s %4d %s",
                                     getProductName(), getSerial(), getAddr());
        }
 
        public String toShortString() {
                return String.format("%-20.20s %4d %s",
                                     getProductName(), getSerial(), getAddr());
        }
 
        public String toShortString() {
-               String  name = getName();
-               if (name == null)
-                       name = "Altus Metrum";
                return String.format("%s %d %s",
                return String.format("%s %d %s",
-                                    getProduct(), getSerial(), getAddr());
+                                    getProductName(), getSerial(), getAddr());
 
        }
 
 
        }