X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosPyro.java;h=c948ce21b1bf4d8cefd8b839c03cd8c05b492182;hp=a14141232dbc6dcd30d3f3a5c0acefbc8e6ce6ff;hb=b1a90adac9f6e2a609ce1ccd6749462bb5c9adbe;hpb=9e18c524fa2d1f648f265b3c3105f5ceacf06c10 diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java index a1414123..c948ce21 100644 --- a/altoslib/AltosPyro.java +++ b/altoslib/AltosPyro.java @@ -15,7 +15,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -package org.altusmetrum.altoslib_3; +package org.altusmetrum.altoslib_11; import java.util.*; import java.text.*; @@ -138,7 +138,7 @@ public class AltosPyro { 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) { @@ -277,7 +277,7 @@ public class AltosPyro { 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);