X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FIdPanel.java;h=6ae19f06c40ce508faf49d90afe5f9c335c1ea40;hb=7c9fbca0e2d9be5fd05e1c89f24f81d558bf6849;hp=fb9bcbbb14cc9ba0288fc53f83d6dd3fe53948ff;hpb=a889a61789f15e79ecde7043cddfdea18ad00166;p=jalview.git diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java index fb9bcbb..6ae19f0 100755 --- a/src/jalview/gui/IdPanel.java +++ b/src/jalview/gui/IdPanel.java @@ -36,9 +36,7 @@ import java.awt.event.MouseMotionListener; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import java.util.List; -import java.util.Vector; -import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.SwingUtilities; import javax.swing.ToolTipManager; @@ -108,8 +106,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, @@ -200,17 +198,17 @@ public class IdPanel extends JPanel implements MouseListener, int seq = alignPanel.getSeqPanel().findSeq(e); String id = av.getAlignment().getSequenceAt(seq).getName(); - String url = Preferences.sequenceUrlLinks.getDefaultUrl(id); + String url = Preferences.sequenceUrlLinks.getPrimaryUrl(id); try { 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(); } } @@ -328,7 +326,7 @@ public class IdPanel extends JPanel implements MouseListener, Sequence sq = (Sequence) av.getAlignment().getSequenceAt(seq2); // build a new links menu based on the current links + any non-positional // features - Vector nlinks = Preferences.sequenceUrlLinks.getLinksForMenu(); + List nlinks = Preferences.sequenceUrlLinks.getLinksForMenu(); SequenceFeature sfs[] = sq == null ? null : sq.getSequenceFeatures(); if (sfs != null) { @@ -340,7 +338,7 @@ public class IdPanel extends JPanel implements MouseListener, { for (int l = 0, lSize = sf.links.size(); l < lSize; l++) { - nlinks.addElement(sf.links.elementAt(l)); + nlinks.add(sf.links.elementAt(l)); } } }