JAL-3184 JAL-2843 restore saved feature filters correctly

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

diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java
index 331e738..d2ba95b 100755 (executable)
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -21,6 +21,7 @@
 package jalview.gui;
 
 import jalview.analysis.Conservation;
+import jalview.api.FeatureColourI;
 import jalview.binding.Annotation;
 import jalview.binding.AnnotationElement;
 import jalview.binding.Features;
@@ -40,6 +41,7 @@ import jalview.datamodel.SequenceFeature;
 import jalview.io.FileFormat;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.ColourSchemeProperty;
+import jalview.schemes.FeatureColour;
 import jalview.structure.StructureSelectionManager;
 import jalview.util.MessageManager;
 import jalview.util.jarInputStreamProvider;
@@ -428,8 +430,8 @@ public class Jalview2XML_V1
 
     if (jms.getFeatureSettings() != null)
     {
-      Hashtable featuresDisplayed = new Hashtable();
-      Hashtable featureColours = new Hashtable();
+      Hashtable<String, Integer> featuresDisplayed = new Hashtable<>();
+      Hashtable<String, FeatureColourI> featureColours = new Hashtable<>();
       String[] renderOrder = new String[jms.getFeatureSettings()
               .getSettingCount()];
       for (int fs = 0; fs < jms.getFeatureSettings()
@@ -438,7 +440,7 @@ public class Jalview2XML_V1
         Setting setting = jms.getFeatureSettings().getSetting(fs);
 
         featureColours.put(setting.getType(),
-                new java.awt.Color(setting.getColour()));
+                new FeatureColour(new java.awt.Color(setting.getColour())));
 
         renderOrder[fs] = setting.getType();
 
@@ -449,7 +451,8 @@ public class Jalview2XML_V1
         }
       }
       FeatureRendererSettings frs = new FeatureRendererSettings(renderOrder,
-              new Hashtable(), featureColours, 1.0f, null);
+              new Hashtable<String, Boolean>(), featureColours, 1.0f, null,
+              null);
       af.alignPanel.getSeqPanel().seqCanvas.getFeatureRenderer()
               .transferSettings(frs);
     }