X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigPyroUI.java;h=cd887c00c8cadd43ee74d414cad65ed4f8c1c44d;hp=f0b4f0f998a2cb31de3bc668a81aa5fdd10b52fb;hb=198a3d4d5f51de5c0f0413299582479cde4e177f;hpb=d744e588b7504f314e39b1407152d11c031673c9

diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index f0b4f0f9..cd887c00 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -3,7 +3,8 @@
  *
  * 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.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,18 +18,19 @@
 
 package altosui;
 
+import java.text.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosConfigPyroUI
 	extends AltosUIDialog
 	implements ItemListener, DocumentListener, AltosUnitsListener, ActionListener
 {
-	AltosConfigUI	owner;
+	AltosConfigFCUI	owner;
 	Container	pane;
 
 	static Insets il = new Insets(4,4,4,4);
@@ -87,9 +89,9 @@ public class AltosConfigPyroUI
 
 			if (units != null) {
 				try {
-					double v = units.parse(value.getText(), !imperial_units);
+					double v = units.parse_locale(value.getText(), !imperial_units);
 					set(enabled(), v);
-				} catch (NumberFormatException ne) {
+				} catch (ParseException pe) {
 					set(enabled(), 0.0);
 				}
 			}
@@ -104,7 +106,7 @@ public class AltosConfigPyroUI
 				double 	unit_value = new_value;
 				AltosUnits units = AltosPyro.pyro_to_units(flag);
 				if (units != null)
-					unit_value = units.value(new_value);
+					unit_value = units.parse_value(new_value);
 				String	format;
 				if (scale >= 100)
 					format = "%6.2f";
@@ -129,9 +131,9 @@ public class AltosConfigPyroUI
 				AltosUnits units = AltosPyro.pyro_to_units(flag);
 				try {
 					if (units != null)
-						return units.parse(value.getText());
-					return Double.parseDouble(value.getText());
-				} catch (NumberFormatException e) {
+						return units.parse_locale(value.getText());
+					return AltosParse.parse_double_locale(value.getText());
+				} catch (ParseException e) {
 					throw new AltosConfigDataException("\"%s\": %s\n", value.getText(), e.getMessage());
 				}
 			}
@@ -285,39 +287,48 @@ public class AltosConfigPyroUI
 		"0.050", "0.100", "0.250", "0.500", "1.0", "2.0"
 	};
 
+	boolean	initializing;
+
 	public void set_pyro_firing_time(double new_pyro_firing_time) {
+		initializing = true;
 		pyro_firing_time_value.setSelectedItem(Double.toString(new_pyro_firing_time));
 		pyro_firing_time_value.setEnabled(new_pyro_firing_time >= 0);
+		initializing = false;
 	}
 
 	public double get_pyro_firing_time() throws AltosConfigDataException {
 		String	v = pyro_firing_time_value.getSelectedItem().toString();
 
 		try {
-			return Double.parseDouble(v);
-		} catch (NumberFormatException e) {
+			return AltosParse.parse_double_locale(v);
+		} catch (ParseException e) {
 			throw new AltosConfigDataException("Invalid pyro firing time \"%s\"", v);
 		}
 	}
 
 	public void set_dirty() {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void itemStateChanged(ItemEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void changedUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void insertUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void removeUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void units_changed(boolean imperial_units) {
@@ -336,9 +347,9 @@ public class AltosConfigPyroUI
 	/* A window listener to catch closing events and tell the config code */
 	class ConfigListener extends WindowAdapter {
 		AltosConfigPyroUI	ui;
-		AltosConfigUI		owner;
+		AltosConfigFCUI		owner;
 
-		public ConfigListener(AltosConfigPyroUI this_ui, AltosConfigUI this_owner) {
+		public ConfigListener(AltosConfigPyroUI this_ui, AltosConfigFCUI this_owner) {
 			ui = this_ui;
 			owner = this_owner;
 		}
@@ -356,7 +367,7 @@ public class AltosConfigPyroUI
 			setVisible(false);
 	}
 
-	public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros, double pyro_firing_time) {
+	public AltosConfigPyroUI(AltosConfigFCUI in_owner, AltosPyro[] pyros, double pyro_firing_time) {
 
 		super(in_owner, "Configure Pyro Channels", false);