altosui: Remove duplicate AltosUSBDevice

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altosui/AltosUSBDevice.java b/altosui/AltosUSBDevice.java
deleted file mode 100644 (file)
index 5c6a897..0000000
--- a/altosui/AltosUSBDevice.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-import java.util.*;
-import libaltosJNI.*;
-import org.altusmetrum.altosuilib.*;
-
-public class AltosUSBDevice  extends altos_device implements AltosDevice {
-
-       public String toString() {
-               String  name = getName();
-               if (name == null)
-                       name = "Altus Metrum";
-               return String.format("%-20.20s %4d %s",
-                                    name, getSerial(), getPath());
-       }
-
-       public String toShortString() {
-               String  name = getName();
-               if (name == null)
-                       name = "Altus Metrum";
-               return String.format("%s %d %s",
-                                    name, getSerial(), getPath());
-
-       }
-
-       public String getErrorString() {
-               altos_error     error = new altos_error();
-
-               libaltos.altos_get_last_error(error);
-               return String.format("%s (%d)", error.getString(), error.getCode());
-       }
-
-       public SWIGTYPE_p_altos_file open() {
-               return libaltos.altos_open(this);
-       }
-
-       private boolean isAltusMetrum() {
-               if (getVendor() != Altos.vendor_altusmetrum)
-                       return false;
-               if (getProduct() < Altos.product_altusmetrum_min)
-                       return false;
-               if (getProduct() > Altos.product_altusmetrum_max)
-                       return false;
-               return true;
-       }
-
-       public boolean matchProduct(int want_product) {
-
-               if (!isAltusMetrum())
-                       return false;
-
-               if (want_product == Altos.product_any)
-                       return true;
-
-               if (want_product == Altos.product_basestation)
-                       return matchProduct(Altos.product_teledongle) ||
-                               matchProduct(Altos.product_teleterra) ||
-                               matchProduct(Altos.product_telebt) ||
-                               matchProduct(Altos.product_megadongle);
-
-               if (want_product == Altos.product_altimeter)
-                       return matchProduct(Altos.product_telemetrum) ||
-                               matchProduct(Altos.product_megametrum);
-
-               int have_product = getProduct();
-
-               if (have_product == Altos.product_altusmetrum)  /* old devices match any request */
-                       return true;
-
-               if (want_product == have_product)
-                       return true;
-
-               return false;
-       }
-
-       static java.util.List<AltosDevice> list(int product) {
-               if (!Altos.load_library())
-                       return null;
-
-               SWIGTYPE_p_altos_list list = libaltos.altos_list_start();
-
-               ArrayList<AltosDevice> device_list = new ArrayList<AltosDevice>();
-               if (list != null) {
-                       for (;;) {
-                               AltosUSBDevice device = new AltosUSBDevice();
-                               if (libaltos.altos_list_next(list, device) == 0)
-                                       break;
-                               if (device.matchProduct(product))
-                                       device_list.add(device);
-                       }
-                       libaltos.altos_list_finish(list);
-               }
-
-               return device_list;
-       }
-}
\ No newline at end of file

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index b97222de1c44d70671d9fcc2480e851f8792f28a..539e14f6e297b740f85350cf313e39cbe4a71004 100644 (file)
--- a/altosui/Makefile.am
+++ b/altosui/Makefile.am
@@ -33,7 +33,6 @@ altosui_JAVA = \
        AltosDebug.java \
        AltosDescent.java \
        AltosDeviceUIDialog.java \
-       AltosUSBDevice.java \
        AltosDisplayThread.java \
        AltosEepromDelete.java \
        AltosEepromDownload.java \

diff --git a/altosuilib/AltosUSBDevice.java b/altosuilib/AltosUSBDevice.java
index 2f4e0dc67b422dc885cdc5ee3f7e2ebc9d042dcb..bab16fb039a06342b2f4bd630ad754af649a76f5 100644 (file)
--- a/altosuilib/AltosUSBDevice.java
+++ b/altosuilib/AltosUSBDevice.java
@@ -50,7 +50,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
                return libaltos.altos_open(this);
        }
 
-       private boolean isAltusMetrum() {
+       public boolean isAltusMetrum() {
                if (getVendor() != AltosUILib.vendor_altusmetrum)
                        return false;
                if (getProduct() < AltosUILib.product_altusmetrum_min)
@@ -89,7 +89,7 @@ public class AltosUSBDevice  extends altos_device implements AltosDevice {
                return false;
        }
 
-       static java.util.List<AltosDevice> list(int product) {
+       static public java.util.List<AltosDevice> list(int product) {
                if (!AltosUILib.load_library())
                        return null;