X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAnnotationFile.java;h=f0f1ca3dfb07cc17c106d784b425818e93cbe16a;hb=8946f41687f4c822ac8d15ee8551f23f156735c4;hp=86b4402b0b8bf9a7958b96773fd15658413e7b62;hpb=1ed1e912bfd2b5123fcd0395581adf117f5bbaff;p=jalview.git diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java index 86b4402..f0f1ca3 100755 --- a/src/jalview/io/AnnotationFile.java +++ b/src/jalview/io/AnnotationFile.java @@ -646,7 +646,7 @@ public class AnnotationFile String refSeqId = null; - public boolean annotateAlignmentView(AlignViewportI viewport, String file, + public boolean annotateAlignmentView(AlignViewportI viewport, Object file, DataSourceType protocol) { ColumnSelection colSel = viewport.getColumnSelection(); @@ -677,23 +677,23 @@ public class AnnotationFile } public boolean readAnnotationFile(AlignmentI al, HiddenColumns hidden, - String file, DataSourceType sourceType) + Object file, DataSourceType sourceType) { BufferedReader in = null; try { if (sourceType == DataSourceType.FILE) { - in = new BufferedReader(new FileReader(file)); + in = FileLoader.getBufferedReader(file); } else if (sourceType == DataSourceType.URL) { - URL url = new URL(file); + URL url = new URL(file.toString()); in = new BufferedReader(new InputStreamReader(url.openStream())); } else if (sourceType == DataSourceType.PASTE) { - in = new BufferedReader(new StringReader(file)); + in = new BufferedReader(new StringReader(file.toString())); } else if (sourceType == DataSourceType.CLASSLOADER) {