git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into trialMerge
[jalview.git]
/
src
/
jalview
/
gui
/
JvSwingUtils.java
diff --git
a/src/jalview/gui/JvSwingUtils.java
b/src/jalview/gui/JvSwingUtils.java
index
d44080a
..
41287d2
100644
(file)
--- a/
src/jalview/gui/JvSwingUtils.java
+++ b/
src/jalview/gui/JvSwingUtils.java
@@
-330,13
+330,13
@@
public final class JvSwingUtils
* @param entries
* @param tooltips
*/
* @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);
final ComboBoxTooltipRenderer renderer = new ComboBoxTooltipRenderer();
combo.setRenderer(renderer);
- for (String attName : entries)
+ for (Object attName : entries)
{
combo.addItem(attName);
}
{
combo.addItem(attName);
}