X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=a421621299ce364bc11b4ae9f2f1c12df3befe84;hp=b072ede755e2cbf56afaacd453c2fe6157228c72;hb=25cdbf15e7284eb963070b28dd886aa299af6487;hpb=e637367e8b940e1642a07b3b7c99147561de9cf1

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index b072ede7..a4216212 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -21,8 +21,9 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import java.text.*;
+import org.altusmetrum.altoslib_9.*;
+import org.altusmetrum.altosuilib_9.*;
 
 public class AltosConfigUI
 	extends AltosUIDialog
@@ -976,12 +977,17 @@ public class AltosConfigUI
 
 	}
 
-	public int main_deploy() {
-		return (int) (AltosConvert.height.parse(main_deploy_value.getSelectedItem().toString()) + 0.5);
+	public int main_deploy() throws AltosConfigDataException {
+		String	str = main_deploy_value.getSelectedItem().toString();
+		try {
+			return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+		} catch (ParseException pe) {
+			throw new AltosConfigDataException("invalid main deploy height %s", str);
+		}
 	}
 
 	String get_main_deploy_label() {
-		return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units_name(AltosLib.MISSING));
+		return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units());
 	}
 
 	String[] main_deploy_values() {
@@ -1006,14 +1012,21 @@ public class AltosConfigUI
 		String v = main_deploy_value.getSelectedItem().toString();
 		main_deploy_label.setText(get_main_deploy_label());
 		set_main_deploy_values();
-		int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5);
-		set_main_deploy(m);
+		try {
+			int m = (int) (AltosConvert.height.parse_locale(v, !imperial_units) + 0.5);
+			set_main_deploy(m);
+		} catch (ParseException pe) {
+		}
 
 		if (tracker_motion_value.isEnabled()) {
 			String motion = tracker_motion_value.getSelectedItem().toString();
 			tracker_motion_label.setText(get_tracker_motion_label());
 			set_tracker_motion_values();
-			set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
+			try {
+				int m = (int) (AltosConvert.height.parse_locale(motion, !imperial_units) + 0.5);
+				set_tracker_motion(m);
+			} catch (ParseException pe) {
+			}
 		}
 
 		if (!was_dirty)
@@ -1245,7 +1258,7 @@ public class AltosConfigUI
 	}
 
 	String get_tracker_motion_label() {
-		return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units_name(AltosLib.MISSING));
+		return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units());
 	}
 
 	void set_tracker_tool_tip() {
@@ -1272,7 +1285,12 @@ public class AltosConfigUI
 	}
 
 	public int tracker_motion() throws AltosConfigDataException {
-		return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString());
+		String str = tracker_motion_value.getSelectedItem().toString();
+		try {
+			return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+		} catch (ParseException pe) {
+			throw new AltosConfigDataException("invalid tracker motion %s", str);
+		}
 	}
 
 	public void set_tracker_interval(int tracker_interval) {