git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2aa69a7
)
inline submission of alignment with correct crlf
author
jprocter
<Jim Procter>
Wed, 5 Jan 2011 16:06:03 +0000
(16:06 +0000)
committer
jprocter
<Jim Procter>
Wed, 5 Jan 2011 16:06:03 +0000
(16:06 +0000)
src/jalview/ws/rest/params/Alignment.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws/rest/params/Alignment.java
b/src/jalview/ws/rest/params/Alignment.java
index
922f933
..
0027057
100644
(file)
--- a/
src/jalview/ws/rest/params/Alignment.java
+++ b/
src/jalview/ws/rest/params/Alignment.java
@@
-7,11
+7,14
@@
import jalview.ws.rest.RestJob;
import jalview.ws.rest.InputType.molType;
import java.io.BufferedOutputStream;
import jalview.ws.rest.InputType.molType;
import java.io.BufferedOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.File;
import java.io.FileOutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
import java.nio.charset.Charset;
import org.apache.http.entity.mime.content.ContentBody;
import java.nio.charset.Charset;
import org.apache.http.entity.mime.content.ContentBody;
@@
-53,9
+56,13
@@
public class Alignment extends InputType {
throw new NoValidInputDataException("Couldn't write out alignment to file.",ex);
}
} else {
throw new NoValidInputDataException("Couldn't write out alignment to file.",ex);
}
} else {
- StringBody sb = new StringBody(new jalview.io.FormatAdapter().formatSequences(format, alignment, jvsuffix)); // , "text/plain", Charset.forName("UTF-8"));
+ jalview.io.FormatAdapter fa = new jalview.io.FormatAdapter();
+ fa.setNewlineString("\r\n");
+ return new StringBody((fa.formatSequences(format, alignment, jvsuffix)));
+ //,
+ //"text/plain",Charset.forName("UTF-8"));
+ // , "text/plain", Charset.forName("UTF-8"));
// sb.getContentTypeParameters().put("filename", "alignment.fa");
// sb.getContentTypeParameters().put("filename", "alignment.fa");
- return sb;
}
}
}
\ No newline at end of file
}
}
}
\ No newline at end of file