From: Bill Kuker <bkuker@billkuker.com>
Date: Sun, 24 Oct 2010 18:49:49 +0000 (+0000)
Subject: fixed approx
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=0cca0af90a004d77e3677379e74bca539f89b250;p=sw%2Fmotorsim

fixed approx
---

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index de6ceaf..e208305 100644
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -72,14 +72,17 @@ public class RocketScience {
 
 	@SuppressWarnings("unchecked")
 	public static <T extends Quantity> String approx(Amount<T> a) {
+		if (a == null)
+			return "NULL";
 		Unit<T> u = RocketScience.UnitPreference.preference.getPreferredUnit(a
 				.getUnit());
 		double d = a.doubleValue(u);
 
 		DecimalFormat df;
+
 		if (Math.abs(d) < 10.0) {
 			df = new DecimalFormat("#.##");
-		} else if (Math.abs(d) < 10.0) {
+		} else if (Math.abs(d) < 100.0) {
 			df = new DecimalFormat("#.#");
 		} else {
 			df = new DecimalFormat("#");