X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosHeight.java;h=8c67e043960ecbb7cb37463a3d758714aa05452c;hp=96f5722bde80bcca8b3a33d32b3d32b345d2acd4;hb=c8078d352a7f54a4a97d25af080155d3f875536a;hpb=6827d0a7c59d606ea05387465f1ad4d914babd49

diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index 96f5722b..8c67e043 100644
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -15,36 +15,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_5;
 
 public class AltosHeight extends AltosUnits {
 
-	public double value(double v) {
-		if (AltosConvert.imperial_units)
+	public double value(double v, boolean imperial_units) {
+		if (imperial_units)
 			return AltosConvert.meters_to_feet(v);
 		return v;
 	}
 
-	public double parse(String s) throws NumberFormatException {
-		double	v = Double.parseDouble(s);
-		if (AltosConvert.imperial_units)
-			v = AltosConvert.feet_to_meters(v);
+	public double inverse(double v, boolean imperial_units) {
+		if (imperial_units)
+			return AltosConvert.feet_to_meters(v);
 		return v;
 	}
 
-	public String show_units() {
-		if (AltosConvert.imperial_units)
+	public String show_units(boolean imperial_units) {
+		if (imperial_units)
 			return "ft";
 		return "m";
 	}
 
-	public String say_units() {
-		if (AltosConvert.imperial_units)
+	public String say_units(boolean imperial_units) {
+		if (imperial_units)
 			return "feet";
 		return "meters";
 	}
 
-	public int show_fraction(int width) {
+	public int show_fraction(int width, boolean imperial_units) {
 		return width / 9;
 	}
 }
\ No newline at end of file