X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosPyro.java;h=0ea3bfc13ccacdf950b204b452e98ef84d5f248c;hp=9b7e79f33048ea07c7ce4ce96c7b9a948c427c9e;hb=cf20e213f39fb24f15e0ac94307c2d138fcadecb;hpb=87c8bb3956897830da1f7aaca2990a9571767b73

diff --git a/altoslib/AltosPyro.java b/altoslib/AltosPyro.java
index 9b7e79f3..0ea3bfc1 100644
--- a/altoslib/AltosPyro.java
+++ b/altoslib/AltosPyro.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
@@ -15,7 +16,7 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_8;
+package org.altusmetrum.altoslib_12;
 
 import java.util.*;
 import java.text.*;
@@ -138,7 +139,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 +278,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);
@@ -289,6 +290,10 @@ public class AltosPyro {
 		}
 	}
 
+	public AltosPyro() {
+		this(0);
+	}
+
 	public String toString() {
 		String	ret = String.format("%d", channel);