Consolidating some to String methods in RocketScieence

[sw/motorsim] / src / com / billkuker / rocketry / motorsim / RocketScience.java

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index ecb2e5bd76f6d78ae82fb7ffe7a5908e488dee1c..a9a36d82083988a458272b0456f5386cb34f500c 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -1,6 +1,7 @@
 package com.billkuker.rocketry.motorsim;\r
 \r
 import java.text.DecimalFormat;\r
+import java.text.NumberFormat;\r
 import java.util.HashSet;\r
 import java.util.Set;\r
 import java.util.prefs.Preferences;\r
@@ -86,7 +87,12 @@ public class RocketScience {
                }\r
        }\r
 \r
-       public static <T extends Quantity> String approx(Amount<T> a) {\r
+       public static <T extends Quantity> String toString(Amount<T> a) {\r
+               final NumberFormat nf = new DecimalFormat("##########.###");\r
+               return nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit();\r
+       }\r
+       \r
+       public static <T extends Quantity> String ammountToRoundedString(Amount<T> a) {\r
                if (a == null)\r
                        return "NULL";\r
                Unit<T> u = RocketScience.UnitPreference.preference.getPreferredUnit(a\r