Merge branch 'develop' into trialMerge

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

diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java
index 35a463c..81960e0 100644 (file)
--- a/src/jalview/gui/AnnotationExporter.java
+++ b/src/jalview/gui/AnnotationExporter.java
@@ -20,11 +20,10 @@
  */
 package jalview.gui;
 
-import jalview.api.FeatureColourI;
+import jalview.api.FeatureRenderer;
 import jalview.bin.Cache;
 import jalview.datamodel.AlignmentAnnotation;
 import jalview.datamodel.SequenceI;
-import jalview.datamodel.features.FeatureMatcherSetI;
 import jalview.io.AnnotationFile;
 import jalview.io.FeaturesFile;
 import jalview.io.JalviewFileChooser;
@@ -38,8 +37,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.FileWriter;
 import java.io.PrintWriter;
-import java.util.List;
-import java.util.Map;
 
 import javax.swing.BorderFactory;
 import javax.swing.ButtonGroup;
@@ -215,24 +212,18 @@ public class AnnotationExporter extends JPanel
   {
     String text;
     SequenceI[] sequences = ap.av.getAlignment().getSequencesArray();
-    Map<String, FeatureColourI> featureColours = ap.getFeatureRenderer()
-            .getDisplayedFeatureCols();
-    Map<String, FeatureMatcherSetI> featureFilters = ap.getFeatureRenderer()
-            .getFeatureFilters();
-    List<String> featureGroups = ap.getFeatureRenderer()
-            .getDisplayedFeatureGroups();
     boolean includeNonPositional = ap.av.isShowNPFeats();
 
     FeaturesFile formatter = new FeaturesFile();
+    final FeatureRenderer fr = ap.getFeatureRenderer();
     if (GFFFormat.isSelected())
     {
-      text = formatter.printGffFormat(sequences, featureColours,
-              featureGroups, includeNonPositional);
+      text = formatter.printGffFormat(sequences, fr, includeNonPositional);
     }
     else
     {
-      text = formatter.printJalviewFormat(sequences, featureColours,
-              featureFilters, featureGroups, includeNonPositional);
+      text = formatter.printJalviewFormat(sequences, fr,
+              includeNonPositional);
     }
     return text;
   }