X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=webservices%2Fcompbio%2Fws%2Fclient%2FIOHelper.java;h=88b695a2ffb44f09b6705c3d09d0ffd61e2c2ff0;hb=99ab39d360a99ec101152070146b63773a1d6453;hp=8fbf76350f886e3e8e8e45842b40375b1d2fc3da;hpb=9d860c3793c6812f643caa01fc80a0036fa3fe2b;p=jabaws.git

diff --git a/webservices/compbio/ws/client/IOHelper.java b/webservices/compbio/ws/client/IOHelper.java
index 8fbf763..88b695a 100644
--- a/webservices/compbio/ws/client/IOHelper.java
+++ b/webservices/compbio/ws/client/IOHelper.java
@@ -4,11 +4,10 @@ import static compbio.ws.client.Constraints.pseparator;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
-import java.io.OutputStream;
+import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -74,14 +73,9 @@ public class IOHelper {
 		return params;
 	}
 
-	static OutputStream getOutStream(File file) {
+	static Writer getWriter(File file) throws IOException {
 		assert file != null && file.exists();
-		try {
-			return new FileOutputStream(file);
-		} catch (FileNotFoundException e) {
-			e.printStackTrace();
-		}
-		return null;
+		return new FileWriter(file);
 	}
 
 	/**
@@ -92,17 +86,17 @@ public class IOHelper {
 	 * @param align
 	 *            the alignment to output
 	 */
-	static void writeOut(OutputStream outStream, Alignment align) {
+	static void writeOut(Writer writer, Alignment align) {
 		try {
-			ClustalAlignmentUtil.writeClustalAlignment(outStream, align);
+			ClustalAlignmentUtil.writeClustalAlignment(writer, align);
 		} catch (IOException e) {
 			System.err
 					.println("Problems writing output file! Stack trace is below: ");
 			e.printStackTrace();
 		} finally {
-			if (outStream != null) {
+			if (writer != null) {
 				try {
-					outStream.close();
+					writer.close();
 				} catch (IOException ignored) {
 					// e.printStackTrace();
 				}
@@ -117,17 +111,17 @@ public class IOHelper {
 	 * @param result
 	 *            the AACon scores to output
 	 */
-	static void writeOut(OutputStream outStream, ScoreManager results) {
+	static void writeOut(Writer writer, ScoreManager results) {
 		try {
-			results.writeOut(outStream);
+			results.writeOut(writer);
 		} catch (IOException e) {
 			System.err
 					.println("Problems writing output file! Stack trace is below: ");
 			e.printStackTrace();
 		} finally {
-			if (outStream != null) {
+			if (writer != null) {
 				try {
-					outStream.close();
+					writer.close();
 				} catch (IOException ignored) {
 					// e.printStackTrace();
 				}