X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FJvSwingUtils.java;h=7a5dde64121167ae52a97f752bcc62f5bda42d26;hb=refs%2Fheads%2Fspike%2Fclinvar;hp=8ec40cb4d525d1b0f3967821b958f22074655685;hpb=e29f805236e7328f34c0664e72f46925d7d28e07;p=jalview.git diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index 8ec40cb..7a5dde6 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -20,7 +20,6 @@ */ package jalview.gui; -import jalview.io.IntKeyStringValueEntry; import jalview.util.MessageManager; import java.awt.BorderLayout; @@ -97,7 +96,7 @@ public final class JvSwingUtils } return (enclose ? "" : "") - + "

" + + "

" + ttext + "

" + ((enclose ? "" : "")); } @@ -320,13 +319,13 @@ public final class JvSwingUtils * @param entries * @param tooltips */ - public static JComboBox buildComboWithTooltips( - List entries, List tooltips) + public static JComboBox buildComboWithTooltips( + List entries, List tooltips) { - JComboBox combo = new JComboBox<>(); + JComboBox combo = new JComboBox<>(); final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer(); combo.setRenderer(renderer); - for (String attName : entries) + for (Object attName : entries) { combo.addItem(attName); } @@ -356,49 +355,6 @@ public final class JvSwingUtils } /** - * A helper method to build a drop-down choice of values, with tooltips for the - * entries - * - * @param entries - * @param tooltips - */ - public static JComboBox buildIntKeyStringValueComboWithTooltips( - List entries, List tooltips) - { - JComboBox combo = new JComboBox<>(); - final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer(); - combo.setRenderer(renderer); - for (IntKeyStringValueEntry attName : entries) - { - combo.addItem(attName); - } - renderer.setTooltips(tooltips); - final MouseAdapter mouseListener = new MouseAdapter() - { - @Override - public void mouseEntered(MouseEvent e) - { - int j = combo.getSelectedIndex(); - if (j > -1) - { - combo.setToolTipText(tooltips.get(j)); - } - } - - @Override - public void mouseExited(MouseEvent e) - { - combo.setToolTipText(null); - } - }; - for (Component c : combo.getComponents()) - { - c.addMouseListener(mouseListener); - } - return combo; - } - - /** * Adds a titled border to the component in the default font and position (top * left), optionally witht italic text *