X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAnnotationFile.java;fp=src%2Fjalview%2Fio%2FAnnotationFile.java;h=aa29ced5c7db573a390dbceb340b5f7fd081e983;hb=3da878124135ff033f42d19d8733891b09e953cd;hp=dd385d2c4ad54b865b013137e2babf9c0bb9dcf1;hpb=549cdd8bcac48cade7880c4a800d9c90b4d02632;p=jalview.git diff --git a/src/jalview/io/AnnotationFile.java b/src/jalview/io/AnnotationFile.java index dd385d2..aa29ced 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.getBuffereReader(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) {