imports

[sw/motorsim] / src / com / billkuker / rocketry / motorsim / io / MotorIO.java

diff --git a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
index d328a44d86c0f94d155686e760c0ad8c47ad3d4c..c784f0ea9f2c9fc24cf0da228efb8f9d367420ec 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
+++ b/src/com/billkuker/rocketry/motorsim/io/MotorIO.java
@@ -1,13 +1,10 @@
 package com.billkuker.rocketry.motorsim.io;\r
 \r
-import java.io.File;\r
-import java.io.FileReader;\r
-import java.io.FileWriter;\r
 import java.io.IOException;\r
+import java.io.InputStream;\r
 import java.io.ObjectInputStream;\r
 import java.io.ObjectOutputStream;\r
-import java.io.StringReader;\r
-import java.io.StringWriter;\r
+import java.io.OutputStream;\r
 import java.net.URI;\r
 import java.net.URISyntaxException;\r
 \r
@@ -114,17 +111,15 @@ public class MotorIO {
                return xstream;\r
        }\r
        \r
-       public static void writeMotor(Motor m, File f) throws IOException{\r
-               FileWriter fout = new FileWriter(f);\r
-               ObjectOutputStream out = getXStream().createObjectOutputStream(fout);\r
+       public static void writeMotor(Motor m, OutputStream os) throws IOException{\r
+               ObjectOutputStream out = getXStream().createObjectOutputStream(os);\r
                out.writeObject(m);\r
                out.close();\r
-               fout.close();\r
+               os.flush();\r
        }\r
        \r
-       public static Motor readMotor(File f) throws IOException{\r
-               FileReader fin = new FileReader(f);\r
-               ObjectInputStream in = getXStream().createObjectInputStream(fin);\r
+       public static Motor readMotor(InputStream is) throws IOException{\r
+               ObjectInputStream in = getXStream().createObjectInputStream(is);\r
                Motor m;\r
                try {\r
                        m = (Motor)in.readObject();\r