X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosFlashUI.java;h=6b78aea7f69a2706a3e2d439159ec2ecfe42a6f5;hb=1a3c0805f88c50f27dd4e78b9be2a4c3ef9e46c8;hp=7186e91b33024f14fc7c1e21d3c0dda5f99a6cfe;hpb=695dba4e37ccca9a2dc06e1656699a13406002c1;p=fw%2Faltos

diff --git a/altosuilib/AltosFlashUI.java b/altosuilib/AltosFlashUI.java
index 7186e91b..6b78aea7 100644
--- a/altosuilib/AltosFlashUI.java
+++ b/altosuilib/AltosFlashUI.java
@@ -16,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_13;
+package org.altusmetrum.altosuilib_14;
 
 import java.awt.*;
 import java.awt.event.*;
@@ -24,7 +24,7 @@ import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altoslib_14.*;
 
 public class AltosFlashUI
 	extends AltosUIDialog
@@ -64,8 +64,7 @@ public class AltosFlashUI
 		"telemetrum-v1",
 		"telemini-v1",
 		"telenano",
-		"teleshield",
-		"teleterra"
+		"teleshield"
 	};
 
 	private static final String[] pair_programmed_devices = {
@@ -78,8 +77,7 @@ public class AltosFlashUI
 		"TeleMetrum-v1",
 		"TeleMini-v1",
 		"TeleNano",
-		"TeleShield",
-		"TeleTerra"
+		"TeleShield"
 	};
 
 	private boolean is_pair_programmed() {
@@ -133,7 +131,7 @@ public class AltosFlashUI
 		Insets il = new Insets(4,4,4,4);
 		Insets ir = new Insets(4,4,4,4);
 
-		pane = getContentPane();
+		pane = getScrollablePane();
 		pane.setLayout(new GridBagLayout());
 
 		c = new GridBagConstraints();
@@ -210,9 +208,18 @@ public class AltosFlashUI
 
 		public AltosHexfileFilter(String usb_product) {
 			int l;
+			int dash;
 
 			/* Trim off any trailing variants (1.0a vs 1.0) */
-			for (l = usb_product.length(); l > 0; l--) {
+			for (dash = usb_product.length(); dash > 0; dash--) {
+				char c = usb_product.charAt(dash-1);
+				if (c == '-')
+					break;
+			}
+			if (dash == 0)
+				dash = usb_product.length();
+
+			for (l = usb_product.length(); l > dash; l--) {
 				char c = usb_product.charAt(l-1);
 				if (c < 'a' || 'z' < c)
 					break;
@@ -639,7 +646,7 @@ public class AltosFlashUI
 			super(in_owner, "Open Flash Target Device", true);
 			owner = in_owner;
 
-			Container		pane = getContentPane();
+			Container		pane = getScrollablePane();
 			GridBagConstraints	c = new GridBagConstraints();
 			Insets			i = new Insets(4,4,4,4);