Merge branch 'JAL-1483_29dev' into develop

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

diff --git a/src/jalview/gui/AnnotationExporter.java b/src/jalview/gui/AnnotationExporter.java
index e966c92..e43c06b 100644 (file)
--- a/src/jalview/gui/AnnotationExporter.java
+++ b/src/jalview/gui/AnnotationExporter.java
@@ -33,7 +33,6 @@ import java.awt.Color;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.util.Enumeration;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -128,14 +127,16 @@ public class AnnotationExporter extends JPanel
         if (GFFFormat.isSelected())
         {
           text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
-                  .getDataset().getSequencesArray(),
-                  getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());// ap.av.featuresDisplayed//);
+                  .getDataset().getSequencesArray(), ap
+                  .getFeatureRenderer().getDisplayedFeatureCols(), true,
+                  ap.av.isShowNpFeats());// ap.av.featuresDisplayed//);
         }
         else
         {
           text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
-                  .getDataset().getSequencesArray(),
-                  getDisplayedFeatureCols(), true, ap.av.isShowNpFeats()); // ap.av.featuresDisplayed);
+                  .getDataset().getSequencesArray(), ap
+                  .getFeatureRenderer().getDisplayedFeatureCols(), true,
+                  ap.av.isShowNpFeats()); // ap.av.featuresDisplayed);
         }
       }
       else
@@ -175,14 +176,14 @@ public class AnnotationExporter extends JPanel
       if (GFFFormat.isSelected())
       {
         text = new FeaturesFile().printGFFFormat(ap.av.getAlignment()
-                .getDataset().getSequencesArray(),
-                getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
+                .getDataset().getSequencesArray(), ap.getFeatureRenderer()
+                .getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
       }
       else
       {
         text = new FeaturesFile().printJalviewFormat(ap.av.getAlignment()
-                .getDataset().getSequencesArray(),
-                getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
+                .getDataset().getSequencesArray(), ap.getFeatureRenderer()
+                .getDisplayedFeatureCols(), true, ap.av.isShowNpFeats());
       }
     }
     else if (!features)
@@ -222,28 +223,6 @@ public class AnnotationExporter extends JPanel
 
     close_actionPerformed(null);
   }
-
-  private Hashtable getDisplayedFeatureCols()
-  {
-    Hashtable fcols = new Hashtable();
-    if (ap.av.getFeaturesDisplayed() == null)
-    {
-      return fcols;
-    }
-
-    Enumeration en = ap.av.getFeaturesDisplayed().keys();
-    FeatureRenderer fr = ap.getSeqPanel().seqCanvas.getFeatureRenderer(); // consider
-                                                                     // higher
-                                                                     // level
-                                                                     // method ?
-    while (en.hasMoreElements())
-    {
-      Object col = en.nextElement();
-      fcols.put(col, fr.featureColours.get(col));
-    }
-    return fcols;
-  }
-
   public void close_actionPerformed(ActionEvent e)
   {
     try