From d113749a183a3ea8f3f7e22c725511f59f1d833f Mon Sep 17 00:00:00 2001
From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 6 Jun 2019 15:17:54 +0100
Subject: [PATCH] JAL-3187 minor code change post merge (signature change)

---
 src/jalview/gui/FeatureTypeSettings.java |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/jalview/gui/FeatureTypeSettings.java b/src/jalview/gui/FeatureTypeSettings.java
index 50efffc..167a63e 100644
--- 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
      */
-    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
-    Collections.sort(soTerms, new Comparator<String>()
+    Collections.sort(soTerms, new Comparator<>()
     {
       @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<>();
-    for (String term : soTerms)
+    for (Object term : soTerms)
     {
       tooltips.add(getSOTermsTooltip(relatedSoTerms.get(term)));
     }
-    JComboBox<String> parentType = JvSwingUtils
+    JComboBox<Object> parentType = JvSwingUtils
             .buildComboWithTooltips(soTerms, tooltips);
     toSubtypes.add(parentType);
 
-- 
1.7.10.2