X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosPyro.java;h=c948ce21b1bf4d8cefd8b839c03cd8c05b492182;hb=2a4d741872449b5332f28e018fa3acc53ed7d891;hp=9e47bc804282f9b6319e1a2b151b81ab03bf5784;hpb=f0216d721ed13f4d3dc608bb6ad8f83732b27c0a;p=fw%2Faltos diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java index 9e47bc80..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_4; +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);