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 (parent:
c2632af
)
remove system.out
author
amwaterhouse
<Andrew Waterhouse>
Tue, 8 May 2007 10:09:27 +0000
(10:09 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 8 May 2007 10:09:27 +0000
(10:09 +0000)
src/jalview/bin/JalviewLite.java
patch
|
blob
|
history
diff --git
a/src/jalview/bin/JalviewLite.java
b/src/jalview/bin/JalviewLite.java
index
e0f0910
..
df11327
100755
(executable)
--- a/
src/jalview/bin/JalviewLite.java
+++ b/
src/jalview/bin/JalviewLite.java
@@
-321,7
+321,6
@@
public class JalviewLite
{
Class.forName("org.jmol.adapter.smarter.SmarterJmolAdapter");
jmolAvailable = true;
{
Class.forName("org.jmol.adapter.smarter.SmarterJmolAdapter");
jmolAvailable = true;
- System.out.println("JMOL FOUND");
}
}
catch (java.lang.ClassNotFoundException ex)
}
}
catch (java.lang.ClassNotFoundException ex)
@@
-563,7
+562,16
@@
public class JalviewLite
}
}
}
}
- param = addProtocol(param);
+ if (inArchive(param) && !jmolAvailable)
+ {
+ protocol = AppletFormatAdapter.CLASSLOADER;
+ }
+ else
+ {
+ protocol = AppletFormatAdapter.URL;
+ param = addProtocol(param);
+ }
+
pdb.setFile(param);
if(seqs!=null)
pdb.setFile(param);
if(seqs!=null)
@@
-582,8
+590,6
@@
public class JalviewLite
protocol);
lastFrameX += 40;
lastFrameY+=40;
protocol);
lastFrameX += 40;
lastFrameY+=40;
-
- System.out.println(lastFrameX+" "+lastFrameY);
}
else
new MCview.AppletPDBViewer(pdb,
}
else
new MCview.AppletPDBViewer(pdb,