fixed approx

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