From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Mon, 14 Sep 2015 08:34:05 +0000 (+0100)
Subject: JAL-1684 align added alignment to match original in split frame
X-Git-Tag: Release_2_10_0~421
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=3f3c83d8aa5b9fda8dafaf4c43373f1c91c4524e;p=jalview.git

JAL-1684 align added alignment to match original in split frame
---

diff --git a/src/jalview/appletgui/CutAndPasteTransfer.java b/src/jalview/appletgui/CutAndPasteTransfer.java
index 5617c64..4590c54 100644
--- a/src/jalview/appletgui/CutAndPasteTransfer.java
+++ b/src/jalview/appletgui/CutAndPasteTransfer.java
@@ -304,7 +304,7 @@ public class CutAndPasteTransfer extends Panel implements ActionListener,
     }
     AlignmentI protein = thisAlignment.isNucleotide() ? al : thisAlignment;
     AlignmentI dna = thisAlignment.isNucleotide() ? thisAlignment : al;
-    boolean mapped = AlignmentUtils.mapProteinToCdna(protein, dna);
+    boolean mapped = AlignmentUtils.mapProteinAlignmentToCdna(protein, dna);
     if (!mapped)
     {
       return false;
@@ -332,6 +332,11 @@ public class CutAndPasteTransfer extends Panel implements ActionListener,
     }
 
     /*
+     * 'align' the added alignment to match the current one
+     */
+    al.alignAs(thisAlignment);
+
+    /*
      * Open SplitFrame with DNA above and protein below, including the alignment
      * from textbox and a copy of the original.
      */