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
embeddedMenus
[jalview.git]
/
src
/
jalview
/
bin
/
Jalview.java
diff --git
a/src/jalview/bin/Jalview.java
b/src/jalview/bin/Jalview.java
index
e5ad207
..
1116fe4
100755
(executable)
--- a/
src/jalview/bin/Jalview.java
+++ b/
src/jalview/bin/Jalview.java
@@
-1,6
+1,6
@@
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
/*
\r
* Jalview - A Sequence Alignment Editor and Viewer
\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
*
\r
* This program is free software; you can redistribute it and/or
\r
* modify it under the terms of the GNU General Public License
\r
@@
-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
@@
-150,20
+151,28
@@
public class Jalview
\r
protocol = "File";
\r
\r
\r
protocol = "File";
\r
\r
- if (file.indexOf("http:") > -1)
\r
+ if (file.indexOf("http:") > -1 || file.indexOf("file:") >-1)
\r
{
\r
protocol = "URL";
\r
}
\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
@@
-271,13
+280,15
@@
public class Jalview
\r
if (file.endsWith(".jar"))
\r
{
\r
\r
if (file.endsWith(".jar"))
\r
{
\r
- new Jalview2XML().LoadJalviewAlign(file);
\r
+ format = "Jalview";
\r
}
\r
else
\r
{
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
}
\r
else
\r
{
\r
format = new jalview.io.IdentifyFile().Identify(file, protocol);
\r
- new jalview.io.FileLoader().LoadFile(file, protocol, format);
\r
}
\r
}
\r
+
\r
+ fileLoader.LoadFile(file, protocol, format);
\r
+
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r