*
* 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
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_2;
+package org.altusmetrum.altoslib_11;
import java.util.*;
import java.text.*;
private static HashMap<Integer,AltosUnits> pyro_to_units = new HashMap<Integer,AltosUnits>();
private static HashMap<Integer,Double> pyro_to_scale = new HashMap<Integer,Double>();
-
+
private static void insert_map(int flag, String string, String name, AltosUnits units, double scale) {
string_to_pyro.put(string, flag);
pyro_to_string.put(flag, string);
pyro_to_units.put(flag, units);
pyro_to_scale.put(flag, scale);
}
-
+
public static int string_to_pyro(String name) {
if (string_to_pyro.containsKey(name))
return string_to_pyro.get(name);
units = pyro_to_units.get(flag);
if (units == null)
return name;
- return String.format ("%s (%s)", name, units.show_units());
+ return String.format ("%s (%s)", name, units.parse_units());
}
public static AltosUnits pyro_to_units(int flag) {
insert_map(pyro_after_motor, pyro_after_motor_string, pyro_after_motor_name, null, 1.0);
insert_map(pyro_delay, pyro_delay_string, pyro_delay_name, null, pyro_delay_scale);
-
+
insert_map(pyro_state_less, pyro_state_less_string, pyro_state_less_name, null, 1.0);
insert_map(pyro_state_greater_or_equal, pyro_state_greater_or_equal_string, pyro_state_greater_or_equal_name, null, 1.0);
}
int value = 0;
++i;
try {
- value = AltosLib.fromdec(tokens[i]);
+ value = (int) AltosLib.fromdec(tokens[i]);
} catch (NumberFormatException n) {
throw new ParseException(String.format("Invalid pyro value \"%s\"",
tokens[i]), i);