projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'branch-1.6' into debian
[fw/altos]
/
altoslib
/
AltosPyro.java
diff --git
a/altoslib/AltosPyro.java
b/altoslib/AltosPyro.java
index 60b8fe5242648c14eaccf96fe7133d1fab80a3f8..c948ce21b1bf4d8cefd8b839c03cd8c05b492182 100644
(file)
--- a/
altoslib/AltosPyro.java
+++ b/
altoslib/AltosPyro.java
@@
-15,7
+15,7
@@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-package org.altusmetrum.altoslib_
5
;
+package org.altusmetrum.altoslib_
11
;
import java.util.*;
import java.text.*;
import java.util.*;
import java.text.*;
@@
-138,7
+138,7
@@
public class AltosPyro {
units = pyro_to_units.get(flag);
if (units == null)
return 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) {
}
public static AltosUnits pyro_to_units(int flag) {
@@
-277,7
+277,7
@@
public class AltosPyro {
int value = 0;
++i;
try {
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);
} catch (NumberFormatException n) {
throw new ParseException(String.format("Invalid pyro value \"%s\"",
tokens[i]), i);