git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
50ad109
)
pass up the errormessage in the exception when a datasource is not readable.
author
jprocter
<Jim Procter>
Thu, 11 Oct 2007 10:36:36 +0000
(10:36 +0000)
committer
jprocter
<Jim Procter>
Thu, 11 Oct 2007 10:36:36 +0000
(10:36 +0000)
src/jalview/io/FileParse.java
patch
|
blob
|
history
diff --git
a/src/jalview/io/FileParse.java
b/src/jalview/io/FileParse.java
index
f4f765c
..
9c05d5f
100755
(executable)
--- a/
src/jalview/io/FileParse.java
+++ b/
src/jalview/io/FileParse.java
@@
-146,6
+146,11
@@
public class FileParse
}
}
}
}
}
}
+ catch (Exception e)
+ {
+ errormessage = "CANNOT ACCESS DATA AT URL '"+fileStr+"' ("+e.getMessage()+")";
+ error=true;
+ }
}
else if (type.equals(AppletFormatAdapter.PASTE))
{
}
else if (type.equals(AppletFormatAdapter.PASTE))
{
@@
-168,6
+173,11
@@
public class FileParse
error = true;
}
}
error = true;
}
}
+ if (dataIn==null)
+ {
+ // pass up the reason why we have no source to read from
+ throw new IOException("Failed to read data from source:\n"+errormessage);
+ }
error=false;
dataIn.mark(READAHEAD_LIMIT);
}
error=false;
dataIn.mark(READAHEAD_LIMIT);
}