git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91e47ad
)
JAL-3187 minor code change post merge (signature change)
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:17:54 +0000
(15:17 +0100)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Thu, 6 Jun 2019 14:17:54 +0000
(15:17 +0100)
src/jalview/gui/FeatureTypeSettings.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/FeatureTypeSettings.java
b/src/jalview/gui/FeatureTypeSettings.java
index
50efffc
..
167a63e
100644
(file)
--- a/
src/jalview/gui/FeatureTypeSettings.java
+++ b/
src/jalview/gui/FeatureTypeSettings.java
@@
-966,27
+966,27
@@
public class FeatureTypeSettings extends JalviewDialog
/*
* combobox to choose 'parent' of sub-types
*/
/*
* combobox to choose 'parent' of sub-types
*/
- List<String> soTerms = new ArrayList<>();
+ List<Object> soTerms = new ArrayList<>();
for (String term : relatedSoTerms.keySet())
{
soTerms.add(term);
}
// sort from most restrictive to most inclusive
for (String term : relatedSoTerms.keySet())
{
soTerms.add(term);
}
// sort from most restrictive to most inclusive
- Collections.sort(soTerms, new Comparator<String>()
+ Collections.sort(soTerms, new Comparator<>()
{
@Override
{
@Override
- public int compare(String o1, String o2)
+ public int compare(Object o1, Object o2)
{
return Integer.compare(relatedSoTerms.get(o1).size(),
relatedSoTerms.get(o2).size());
}
});
List<String> tooltips = new ArrayList<>();
{
return Integer.compare(relatedSoTerms.get(o1).size(),
relatedSoTerms.get(o2).size());
}
});
List<String> tooltips = new ArrayList<>();
- for (String term : soTerms)
+ for (Object term : soTerms)
{
tooltips.add(getSOTermsTooltip(relatedSoTerms.get(term)));
}
{
tooltips.add(getSOTermsTooltip(relatedSoTerms.get(term)));
}
- JComboBox<String> parentType = JvSwingUtils
+ JComboBox<Object> parentType = JvSwingUtils
.buildComboWithTooltips(soTerms, tooltips);
toSubtypes.add(parentType);
.buildComboWithTooltips(soTerms, tooltips);
toSubtypes.add(parentType);