document.onclick = mclose;
// -->
</script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</li>
<li>Note parameter "PDBSeq" is no longer required.<br>
</li>
- <li>Jalview 2.3 was updated to work with Jmol 11. See the <a href="../versions.html">versions archive if you want to download the old Jmol applet</a>.</li>
+ <li>Jalview 2.3 was updated to work with Jmol 11. See the <a href="/development">versions archive if you want to download the old Jmol applet</a>.</li>
<p> </p>
</li>
</ul>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script>
</body>
</html>
document.onclick = mclose;
// -->
</script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</body>
</html>
-
\ No newline at end of file
+
document.onclick = mclose;
// -->
</script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<TITLE>Embedded JalviewLite talking to externally managed Jmol</TITLE>
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
<script src="javascript/deployJava.js"></script>
<script src="jmol/Jmol.js"></script>
<script src="javascript/jquery-1.4.4.min.js"></script>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script>
</body>
</html>
document.onclick = mclose;
// -->
</script>
-
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script></body>
+</body>
</html>
-
\ No newline at end of file
+
document.onclick = mclose;
// -->
</script>
-
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
- <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
- </div>
- </li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
- <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
- </div>
- </li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
- <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
- </div>
- </li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
- <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
- </div>
- </li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
+ </div>
+ </li>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
+ </div>
+ </li>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
+ </div>
+ </li>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
+ </div>
+ </li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script></body>
+</body>
</html>
document.onclick = mclose;
// -->
</script>
-
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
</head>
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script>
</body>
</head>
-</html>
\ No newline at end of file
+</html>
<link href="css/reset.css" rel="stylesheet" type="text/css" />
<link href="css/style.css" rel="stylesheet" type="text/css" />
+<script>
+<!--//--><![CDATA[//><!--
+var _gaq = _gaq || [];_gaq.push(["_setAccount", "UA-9060947-1"]);_gaq.push(["_trackPageview"]);(function() {var ga = document.createElement("script");ga.type = "text/javascript";ga.async = true;ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";var s = document.getElementsByTagName("script")[0];s.parentNode.insertBefore(ga, s);})();
+//--><!]]>
+</script>
<script src="http://www.java.com/js/deployJava.js"></script>
<script src="javascript/jalview.js" language="javascript"></script>
<script> //deployJava.debug="true";
<div id="header">
-<div id="logo"><a href="/" title="Home"></a></div>
+<div id="logo"><a href="http://www.jalview.org" title="Home"></a></div>
<ul id="buttons">
<li id="applet"><a href="applets.html" title="applet"></a></li>
-<li id="desktop"><a href="/webstart/jalview.jnlp" title="desktop"></a></li>
+<li id="desktop"><a href="../webstart/jalview.jnlp" title="desktop"></a></li>
</ul>
</div>
<div id="navInner">
<ul id="sddm">
- <li><a href="#">Home</a></li>
- <li><a href="#" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
+ <li><a href="http://www.jalview.org">Home</a></li>
+ <li><a href="http://www.jalview.org/about" onmouseover="mopen('m1')" onmouseout="mclosetime()">About</a>
<div id="m1" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Documentation</a>
- <a href="#">Publications</a>
- <a href="#">Credits</a>
- <a href="#">Screenshots</a>
+ <a href="http://www.jalview.org/about/documentation">Documentation</a>
+ <a href="http://www.jalview.org/about/citation">Publications</a>
+ <a href="http://www.jalview.org/about/credits">Credits</a>
</div>
</li>
- <li><a href="#">FAQ</a></li>
- <li><a href="#" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
+ <li><a href="http://www.jalview.org/faq">FAQ</a></li>
+ <li><a href="http://www.jalview.org/community" onmouseover="mopen('m3')" onmouseout="mclosetime()" class="community">Community</a>
<div id="m3" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">News Mailing List</a>
- <a href="#">Discussion Mailing List</a>
- <a href="#">Links</a>
- <a href="#">Community News</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-announce">News Mailing List</a>
+ <a href="http://www.jalview.org/mailman/listinfo/jalview-discuss">Discussion Mailing List</a>
+ <a href="http://www.jalview.org/community/links">Links</a>
+ <a href="http://www.jalview.org/community/community-news">Community News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
+ <li><a href="http://www.jalview.org/development" onmouseover="mopen('m4')" onmouseout="mclosetime()" class="development">Development</a>
<div id="m4" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Release History</a>
- <a href="#">Jalview Bug Tracker</a>
- <a href="#">Jalview Git Web</a>
- <a href="#">Development News</a>
+ <a href="http://www.jalview.org/development/release-history">Release History</a>
+ <a href="http://issues.jalview.org">Jalview Bug Tracker</a>
+ <a href="http://source.jalview.org/gitweb/">Jalview Git Web</a>
+ <a href="http://www.jalview.org/development/development-news">Development News</a>
</div>
</li>
- <li><a href="#" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
+ <li><a href="http://www.jalview.org/training" onmouseover="mopen('m5')" onmouseout="mclosetime()" class="training">Training</a>
<div id="m5" onmouseover="mcancelclosetime()" onmouseout="mclosetime()">
- <a href="#">Training Courses</a>
- <a href="#">Training News</a>
+ <a href="http://www.jalview.org/training/training-courses">Training Courses</a>
+ <a href="http://www.jalview.org/training/training-news">Training News</a>
</div>
</li>
- <li><a href="#" class="download-right">Download</a></li>
+ <li><a href="http://www.jalview.org/download" class="download-right">Download</a></li>
</ul>
<div style="clear:both"></div>
</div>
</div>
</div>
</div>
-
-<script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ?
- "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src=\'" + gaJsHost +
- "google-analytics.com/ga.js\' type=\'text/javascript\'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try{
- var pageTracker = _gat._getTracker("'UA-9060947-1'");
- pageTracker._trackPageview();
-} catch(err) {}
-</script>
</body>
</html>
dragEvent.getY());
}
- if ((aa == null) || (aa.length < 1))
+ if (!av.wrapAlignment && ((aa == null) || (aa.length < 1)))
{
g.setColor(Color.black);
g.drawString("Right click", 2, 8);
dragEvent.getY() - scrollOffset);
}
- if ((aa == null) || (aa.length < 1))
+ if (!av.wrapAlignment && ((aa == null) || (aa.length < 1)))
{
g.drawString("Right click", 2, 8);
g.drawString("to add annotation", 2, 18);
updateFromAwtRenderPanel(annotPanel, av);
fm = g.getFontMetrics();
AlignmentAnnotation[] aa = av.getAlignment().getAlignmentAnnotation();
-
+ if (aa==null)
+ {
+ return false;
+ }
int x = 0, y = 0;
int column = 0;
char lastSS;
return "EMBL (CDS)";
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
+
}
{
return "EMBL"; // getDbSource();
}
+
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
{
return "GeneDB"; // getDbSource();
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
return "PDB"; // getDbSource();
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
return null;
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
return "PF03760";
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
return null;
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
return null;
}
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
{
return "Uniprot"; // getDbSource();
}
+
+ @Override
+ public int getTier()
+ {
+ return 0;
+ }
}
*/
boolean isNewerThan(jalviewSourceI jalviewSourceI);
+ /**
+ * test if the source is a reference source for the authority
+ * @return
+ */
+ boolean isReferenceSource();
+
}
protected MultipleConnectionPropertyProviderI connprops = null;
/**
+ * DAS sources are tier 1 - if we have a direct DB connection then we should prefer it
+ */
+ private int tier=1;
+
+ /**
* create a new DbSource proxy for a DAS 1 source
*
* @param dbnbame
throw new Exception("Source " + source.getTitle()
+ " does not support the sequence command.");
}
+ this.tier = 1+((jsrc.isLocal() || jsrc.isReferenceSource()) ? 0 : 1);
this.source = source;
this.dbname = dbname;
this.dbrefname = dbrefname.toUpperCase();
{
return coordsys;
}
+
+ @Override
+ public int getTier()
+ {
+ return tier;
+ }
}
return isLaterThan(getVersion().getCreated(), other.getVersion()
.getCreated());
}
+
+ @Override
+ public boolean isReferenceSource()
+ {
+ // TODO check source object for indication that we are the primary for a DAS coordinate system
+ return false;
+ }
}
import jalview.gui.JvSwingUtils;
import jalview.ws.WSMenuEntryProviderI;
import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.params.ParamDatastoreI;
import java.awt.Color;
import java.awt.event.ActionEvent;
services.add(service);
// retrieve the presets and parameter set and cache now
- service.getParamStore().getPresets();
+ ParamDatastoreI pds = service.getParamStore();
+ if (pds != null)
+ {
+ pds.getPresets();
+ }
service.hasParameters();
if (validServiceUrls == null)
{
: null));
} catch (Exception ex)
{
+ System.err.println("Unexpected exception creating JabaParamStore.");
+ ex.printStackTrace();
}
}
DbSourceProxy[] l = dblist.values().toArray(new DbSourceProxy[0]);
int i = 0;
String[] nm = new String[l.length];
+ // make sure standard dbs appear first, followed by reference das sources, followed by anything else.
for (DbSourceProxy s : l)
{
- nm[i++] = s.getDbName().toLowerCase();
+ nm[i++] = ""+s.getTier()+s.getDbName().toLowerCase();
}
jalview.util.QuickSort.sort(nm, l);
dbs = new ArrayList<DbSourceProxy>();
* @return true if the source has this property
*/
public boolean isA(Object dbsourceproperty);
+
+ /**
+ * Tier for this data source
+ *
+ * @return 0 - primary datasource, 1 - das primary source, 2 - secondary
+ */
+ public int getTier();
}
--- /dev/null
+/**
+ *
+ */
+package jalview.ws.seqfetcher;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import jalview.datamodel.DBRefSource;
+import jalview.ws.DBRefFetcher;
+import jalview.ws.SequenceFetcher;
+import jalview.ws.dbsources.das.api.jalviewSourceI;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * @author jimp
+ *
+ */
+public class DbRefFetcherTest
+{
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception
+ {
+ }
+
+ /**
+ * @throws java.lang.Exception
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception
+ {
+ }
+
+ @Test
+ public void testStandardProtDbs()
+ {
+ String[] defdb = DBRefSource.PROTEINDBS;
+ List<DbSourceProxy> srces = new ArrayList<DbSourceProxy>();
+ for (String ddb : defdb)
+ {
+ SequenceFetcher sfetcher= new SequenceFetcher();
+ List<DbSourceProxy> srcesfordb = sfetcher.getSourceProxy(ddb);
+
+ if (srcesfordb != null)
+ {
+ srces.addAll(srcesfordb);
+ }
+ }
+ DbSourceProxy uniprot=null;
+ int i=0;
+ // append the selected sequence sources to the default dbs
+ for (DbSourceProxy s:srces)
+ {
+ if (s.getDbSource().equalsIgnoreCase(DBRefSource.UNIPROT))
+ {
+ i++;
+ }
+
+ if (s instanceof jalview.ws.dbsources.Uniprot)
+ {
+ uniprot = s;
+ break;
+ }
+ }
+
+ assertTrue("Failed to find Uniprot source as first source amongst "+srces.size()+" sources (source was at position "+i+")", uniprot!=null && i<2);
+ }
+
+}