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:
38ae1e6
)
Error message if file not found moved for headless state
author
amwaterhouse
<Andrew Waterhouse>
Mon, 11 Sep 2006 15:28:53 +0000
(15:28 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Mon, 11 Sep 2006 15:28:53 +0000
(15:28 +0000)
src/jalview/bin/Jalview.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
2f76347
..
5bc98b1
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-137,6
+137,7
@@
public class Jalview
\r
if(file!=null)
\r
{
\r
\r
if(file!=null)
\r
{
\r
+ System.out.println("Opening file: " + file);
\r
\r
if (!file.startsWith("http://"))
\r
{
\r
\r
if (!file.startsWith("http://"))
\r
{
\r
@@
-155,15
+156,23
@@
public class Jalview
protocol = "URL";
\r
}
\r
\r
protocol = "URL";
\r
}
\r
\r
+
\r
+
\r
if (file.endsWith(".jar"))
\r
format = "Jalview";
\r
else
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
\r
if (file.endsWith(".jar"))
\r
format = "Jalview";
\r
else
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
\r
- System.out.println("Opening: " + format + " file " + file);
\r
+
\r
\r
AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);
\r
\r
\r
AlignFrame af = fileLoader.LoadFileWaitTillLoaded(file, protocol, format);
\r
\r
+ if(af==null)
\r
+ {
\r
+ System.out.println("error");
\r
+ return;
\r
+ }
\r
+
\r
data = aparser.getValue("colour");
\r
if(data!=null)
\r
{
\r
data = aparser.getValue("colour");
\r
if(data!=null)
\r
{
\r