JAL-3141 Generified the JvUtils.buildComboWithTooltips to an Object and adjusted...

[jalview.git] / src / jalview / gui / JvSwingUtils.java

diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java
index 8ec40cb..d6090e2 100644 (file)
--- 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;
@@ -320,13 +319,13 @@ public final class JvSwingUtils
    * @param entries
    * @param tooltips
    */
-  public static JComboBox<String> buildComboWithTooltips(
-          List<String> entries, List<String> tooltips)
+  public static JComboBox<Object> buildComboWithTooltips(
+          List<Object> entries, List<String> tooltips)
   {
-    JComboBox<String> combo = new JComboBox<>();
+    JComboBox<Object> 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<IntKeyStringValueEntry> buildIntKeyStringValueComboWithTooltips(
-          List<IntKeyStringValueEntry> entries, List<String> tooltips)
-  {
-    JComboBox<IntKeyStringValueEntry> 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
    *