Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / db / ConversionUtils.java

diff --git a/android/src/net/sf/openrocket/android/db/ConversionUtils.java b/android/src/net/sf/openrocket/android/db/ConversionUtils.java
index a66fc28cf9e09ca804af2f698206b0519bf4db21..a1f5bee9456cafc5670fddbe0332cdc5ef56b133 100644 (file)
--- a/android/src/net/sf/openrocket/android/db/ConversionUtils.java
+++ b/android/src/net/sf/openrocket/android/db/ConversionUtils.java
@@ -4,11 +4,13 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;\r
 import java.io.ObjectInputStream;\r
 import java.io.ObjectOutputStream;\r
+import java.util.ArrayList;\r
+import java.util.List;\r
 \r
 import net.sf.openrocket.motor.Motor;\r
 import net.sf.openrocket.util.Coordinate;\r
 \r
-abstract class ConversionUtils {\r
+public abstract class ConversionUtils {\r
 \r
        static double[] stringToDelays( String value ) {\r
                if (value == null || "".equals(value) ) {\r
@@ -28,7 +30,7 @@ abstract class ConversionUtils {
                return values;\r
        }\r
        \r
-       static String delaysToString( double[] delays ) {\r
+       public static String delaysToString( double[] delays ) {\r
                StringBuilder s = new StringBuilder();\r
                boolean first = true;\r
                for( double d:delays ) {\r
@@ -46,6 +48,25 @@ abstract class ConversionUtils {
                return s.toString();\r
        }\r
        \r
+       public static List<String> delaysToStringList( double[] delays ) {\r
+               ArrayList<String> list = new ArrayList<String>( delays.length );\r
+               for( double d: delays ) {\r
+                       if ( d == Motor.PLUGGED ) {\r
+                               list.add("P");\r
+                       } else {\r
+                               list.add(String.valueOf(Math.round(d)));\r
+                       }\r
+               }\r
+               return list;\r
+       }\r
+       \r
+       public static double stringToDelay( String s ) {\r
+               if ( "P".equals(s) ) {\r
+                       return Motor.PLUGGED;\r
+               }\r
+               return Long.parseLong(s);\r
+       }\r
+       \r
        static double[] deserializeArrayOfDouble( byte[] bytes ) throws Exception {\r
                double[] data = null;\r
                if (bytes != null ) {\r