X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altoslib%2FAltosUnits.java;h=7ca2f03cda27a1662f78eec13f7d9814dab5008d;hb=f275e73f42e0aaf1760da99fb93c394320aafb84;hp=e573a43b7f1e2289e0051006d5680772317a494e;hpb=b89fb51a963635e2effe3a31f803bfc29c2c46b7;p=fw%2Faltos

diff --git a/altoslib/AltosUnits.java b/altoslib/AltosUnits.java
index e573a43b..7ca2f03c 100644
--- a/altoslib/AltosUnits.java
+++ b/altoslib/AltosUnits.java
@@ -15,7 +15,9 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_3;
+package org.altusmetrum.altoslib_7;
+
+import java.text.*;
 
 public abstract class AltosUnits {
 
@@ -29,19 +31,28 @@ public abstract class AltosUnits {
 
 	public abstract int show_fraction(int width, boolean imperial_units);
 
-	public double parse(String s, boolean imperial_units) throws NumberFormatException {
-		double v = Double.parseDouble(s);
+	public double parse_locale(String s, boolean imperial_units) throws ParseException {
+		double v = AltosParse.parse_double_locale(s);
 		return inverse(v, imperial_units);
 	}
 
-	public double parse(String s) throws NumberFormatException {
-		return parse(s, AltosConvert.imperial_units);
+	public double parse_net(String s, boolean imperial_units) throws ParseException {
+		double v = AltosParse.parse_double_net(s);
+		return inverse(v, imperial_units);
+	}
+
+	public double parse_locale(String s) throws ParseException {
+		return parse_locale(s, AltosConvert.imperial_units);
+	}
+
+	public double parse_net(String s) throws ParseException {
+		return parse_net(s, AltosConvert.imperial_units);
 	}
 
 	public double value(double v) {
 		return value(v, AltosConvert.imperial_units);
 	}
-		
+
 	public double inverse(double v) {
 		return inverse(v, AltosConvert.imperial_units);
 	}
@@ -49,15 +60,15 @@ public abstract class AltosUnits {
 	public String show_units() {
 		return show_units(AltosConvert.imperial_units);
 	}
-		
+
 	public String say_units() {
 		return say_units(AltosConvert.imperial_units);
 	}
-		
+
 	public int show_fraction(int width) {
 		return show_fraction(width, AltosConvert.imperial_units);
 	}
-		
+
 	int say_fraction(boolean imperial_units) {
 		return 0;
 	}
@@ -105,4 +116,4 @@ public abstract class AltosUnits {
 	public String say_units(double v) {
 		return say_units(v, AltosConvert.imperial_units);
 	}
-}
\ No newline at end of file
+}