Bump Java library versions

[fw/altos] / altosuilib / AltosFlashUI.java

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 3f1206170f170deafcece0f0eed349b685139ff1..0ab085cf1279d776b7eb16277ef070eca7d8c5ea 100644 (file)
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -15,7 +15,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_2;
+package org.altusmetrum.altosuilib_8;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -23,7 +23,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class AltosFlashUI
        extends AltosUIDialog
@@ -54,10 +54,10 @@ public class AltosFlashUI
        // Flash controller
        AltosProgrammer programmer;
 
-       private static String[] pair_programmed = {
+       private static final String[] pair_programmed_files = {
                "teleballoon",
-               "telebt",
-               "teledongle",
+               "telebt-v1",
+               "teledongle-v0",
                "telefire",
                "telemetrum-v0",
                "telemetrum-v1",
@@ -67,20 +67,34 @@ public class AltosFlashUI
                "teleterra"
        };
 
+       private static final String[] pair_programmed_devices = {
+               "TeleBalloon",
+               "TeleBT-v1",
+               "TeleDongle-v0",
+               "TeleFire",
+               "TeleMetrum-v0",
+               "TeleMetrum-v1",
+               "TeleMini",
+               "TeleNano",
+               "TeleShield",
+               "TeleTerra"
+       };
+
        private boolean is_pair_programmed() {
 
                if (file != null) {
                        String  name = file.getName();
-                       for (int i = 0; i < pair_programmed.length; i++) {
-                               if (name.startsWith(pair_programmed[i]))
+                       for (int i = 0; i < pair_programmed_files.length; i++) {
+                               if (name.startsWith(pair_programmed_files[i]))
                                        return true;
                        }
                }
                if (device != null) {
-                       if (!device.matchProduct(AltosLib.product_altusmetrum) &&
-                           (device.matchProduct(AltosLib.product_teledongle) ||
-                            device.matchProduct(AltosLib.product_telebt)))
-                               return true;
+                       String  name = device.toString();
+                       for (int i = 0; i < pair_programmed_devices.length; i++) {
+                               if (name.startsWith(pair_programmed_devices[i]))
+                                       return true;
+                       }
                }
                return false;
        }
@@ -213,6 +227,7 @@ public class AltosFlashUI
                new AltosHexfileFilter(AltosLib.product_teledongle, "teledongle", "TeleDongle Image"),
                new AltosHexfileFilter(AltosLib.product_telemega, "telemega", "TeleMega Image"),
                new AltosHexfileFilter(AltosLib.product_easymini, "easymini", "EasyMini Image"),
+               new AltosHexfileFilter(AltosLib.product_easymega, "easymega", "EasyMega Image"),
        };
 
        boolean select_source_file() {