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-1807
[jalview.git]
/
src
/
jalview
/
io
/
AnnotationFile.java
diff --git
a/src/jalview/io/AnnotationFile.java
b/src/jalview/io/AnnotationFile.java
index
8706ad5
..
0042141
100755
(executable)
--- a/
src/jalview/io/AnnotationFile.java
+++ b/
src/jalview/io/AnnotationFile.java
@@
-30,6
+30,7
@@
import jalview.datamodel.GraphLine;
import jalview.datamodel.HiddenSequences;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
import jalview.datamodel.HiddenSequences;
import jalview.datamodel.SequenceGroup;
import jalview.datamodel.SequenceI;
+import jalview.jsdev.GenericFileAdapter;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
import jalview.schemes.ResidueProperties;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
import jalview.schemes.ResidueProperties;
@@
-38,10
+39,8
@@
import jalview.util.Comparison;
import jalview.util.Format;
import java.io.BufferedReader;
import jalview.util.Format;
import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.InputStreamReader;
import java.io.StringReader;
import java.io.InputStreamReader;
import java.io.StringReader;
-import java.net.URL;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Enumeration;
import java.util.ArrayList;
import java.util.BitSet;
import java.util.Enumeration;
@@
-694,12
+693,11
@@
public class AnnotationFile
{
if (protocol.equals(AppletFormatAdapter.FILE))
{
{
if (protocol.equals(AppletFormatAdapter.FILE))
{
- in = new BufferedReader(new FileReader(file));
+ in = GenericFileAdapter.getReader(file, false);
}
else if (protocol.equals(AppletFormatAdapter.URL))
{
}
else if (protocol.equals(AppletFormatAdapter.URL))
{
- URL url = new URL(file);
- in = new BufferedReader(new InputStreamReader(url.openStream()));
+ in = GenericFileAdapter.getReader(file, true);
}
else if (protocol.equals(AppletFormatAdapter.PASTE))
{
}
else if (protocol.equals(AppletFormatAdapter.PASTE))
{
@@
-710,7
+708,7
@@
public class AnnotationFile
java.io.InputStream is = getClass().getResourceAsStream("/" + file);
if (is != null)
{
java.io.InputStream is = getClass().getResourceAsStream("/" + file);
if (is != null)
{
- in = new BufferedReader(new java.io.InputStreamReader(is));
+ in = new BufferedReader(new InputStreamReader(is));
}
}
if (in != null)
}
}
if (in != null)