X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=59d12d9c84c533e90defb6256113f8c1b57b3f30;hb=a66859d7d906916f2310ad01cc065d6cfa2506f4;hp=a65be7b1175dc42fc2920699ab96b43e73c0d773;hpb=853624fb32058cccc544ae7d13af6ad4b0800b6c;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index a65be7b..59d12d9 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -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()); @@ -247,10 +254,10 @@ public class IdPanel extends JPanel implements MouseListener, jalview.util.BrowserLauncher.openURL(url); } catch (Exception ex) { - JOptionPane.showInternalMessageDialog(Desktop.desktop, + JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.getString("label.web_browser_not_found_unix"), MessageManager.getString("label.web_browser_not_found"), - JOptionPane.WARNING_MESSAGE); + JvOptionPane.WARNING_MESSAGE); ex.printStackTrace(); } }