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
Merge branch 'alpha/JAL-3362_Jalview_212_alpha' into alpha/merge_212_JalviewJS_2112
[jalview.git]
/
src
/
jalview
/
io
/
AlignFile.java
diff --git
a/src/jalview/io/AlignFile.java
b/src/jalview/io/AlignFile.java
index
5e15223
..
41f2586
100755
(executable)
--- a/
src/jalview/io/AlignFile.java
+++ b/
src/jalview/io/AlignFile.java
@@
-112,7
+112,7
@@
public abstract class AlignFile extends FileParse
* @param sourceType
* What type of file to read from (File, URL, Pasted String)
*/
* @param sourceType
* What type of file to read from (File, URL, Pasted String)
*/
- public AlignFile(String dataObject, DataSourceType sourceType)
+ public AlignFile(Object dataObject, DataSourceType sourceType)
throws IOException
{
this(true, dataObject, sourceType);
throws IOException
{
this(true, dataObject, sourceType);
@@
-130,9
+130,10
@@
public abstract class AlignFile extends FileParse
* What type of file to read from (File, URL)
* @throws IOException
*/
* What type of file to read from (File, URL)
* @throws IOException
*/
- public AlignFile(boolean parseImmediately, String dataObject,
+ public AlignFile(boolean parseImmediately, Object dataObject,
DataSourceType sourceType) throws IOException
{
DataSourceType sourceType) throws IOException
{
+ // BH allows File or String
super(dataObject, sourceType);
initData();
if (parseImmediately)
super(dataObject, sourceType);
initData();
if (parseImmediately)