JAL-1641 round trip test/refactoring

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

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index b492ddf..e663cf8 100644 (file)
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -23,6 +23,7 @@ package jalview.gui;
 import jalview.api.AlignViewportI;
 import jalview.api.AlignmentViewPanel;
 import jalview.api.ComplexAlignFile;
+import jalview.api.FeaturesDisplayedI;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.ColumnSelection;
 import jalview.datamodel.SequenceI;
@@ -83,9 +84,8 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
     this.alignpanel = viewpanel;
     if (alignpanel != null)
     {
-
+      this.viewport = alignpanel.getAlignViewport();
     }
-    this.viewport = alignpanel.getAlignViewport();
     if (viewport != null)
     {
       ok.setText(MessageManager.getString("action.add"));
@@ -240,11 +240,13 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
           boolean showSeqFeatures = ((ComplexAlignFile) source)
                   .isShowSeqFeatures();
           ColourSchemeI cs = ((ComplexAlignFile) source).getColourScheme();
+          FeaturesDisplayedI fd = ((ComplexAlignFile) source)
+                  .getDisplayedFeatures();
           af = new AlignFrame(al, hiddenSeqs, colSel,
                   AlignFrame.DEFAULT_WIDTH,
                   AlignFrame.DEFAULT_HEIGHT);
-
           af.getViewport().setShowSequenceFeatures(showSeqFeatures);
+          af.getViewport().setFeaturesDisplayed(fd);
           af.changeColour(cs);
         }
         else