git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-3026 FileParser for JFileChooser results as ByteArrayInputStream;
[jalview.git]
/
src
/
jalview
/
io
/
FileParse.java
diff --git
a/src/jalview/io/FileParse.java
b/src/jalview/io/FileParse.java
index
7e1940f
..
bb03b35
100755
(executable)
--- a/
src/jalview/io/FileParse.java
+++ b/
src/jalview/io/FileParse.java
@@
-27,6
+27,7
@@
import jalview.api.FeatureSettingsModelI;
import jalview.util.MessageManager;
import java.io.BufferedReader;
import jalview.util.MessageManager;
import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
@@
-348,7
+349,7
@@
public class FileParse
{
// this will be from JavaScript
inFile = file;
{
// this will be from JavaScript
inFile = file;
- dataIn = new BufferedReader(new StringReader(new String(bytes)));
+ dataIn = new BufferedReader(new java.io.InputStreamReader(new ByteArrayInputStream(bytes)));
dataName = fileStr;
}
else if (checkFileSource(fileStr))
dataName = fileStr;
}
else if (checkFileSource(fileStr))
@@
-384,8
+385,8
@@
public class FileParse
*
*/
*
*/
- System.out.println(data);
dataIn = Rdr.getBR(data);
dataIn = Rdr.getBR(data);
+
dataName = fileStr;
}
dataName = fileStr;
}