X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=6a20872ac78a639603a77dfa1b332104d92a8bae;hb=cb826506dcdac81d5299be92bc81f67118cfdf9f;hp=c466c02b082c5564053b87b8c51d9beb965b14ef;hpb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index c466c02..6a20872 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) - * Copyright (C) 2015 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -109,8 +109,8 @@ public class IdPanel extends JPanel implements MouseListener, if (seq > -1 && seq < av.getAlignment().getHeight()) { SequenceI sequence = av.getAlignment().getSequenceAt(seq); - StringBuffer tip = new StringBuffer(64); - seqAnnotReport.createSequenceAnnotationReport(tip, sequence, + StringBuilder tip = new StringBuilder(64); + seqAnnotReport.createTooltipAnnotationReport(tip, sequence, av.isShowDBRefs(), av.isShowNPFeats(), sp.seqCanvas.fr.getMinMax()); setToolTipText(JvSwingUtils.wrapTooltip(true, @@ -225,7 +225,14 @@ public class IdPanel extends JPanel implements MouseListener, url = null; continue; } - ; + + if (urlLink.usesDBAccession()) + { + // this URL requires an accession id, not the name of a sequence + url = null; + continue; + } + if (!urlLink.isValid()) { jalview.bin.Cache.log.error(urlLink.getInvalidMessage());