X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=4773c260e64095030f56119bef694777ea86cd0a;hb=3f9c1d052c8fe2e92ae0d7a1c3088ccb82c58ba5;hp=508e51f2141e965d090fee75d81ba8135736f0ac;hpb=174230b4233d9ce80f94527768d2cd2f76da11ab;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 508e51f..4773c26 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -60,6 +60,9 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
     public void setForInput(AlignViewport viewport)
     {
       this.viewport = viewport;
+      if(viewport!=null)
+        ok.setText("Add");
+
       getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
     }
 
@@ -167,12 +170,12 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
     public void ok_actionPerformed(ActionEvent e)
     {
         String format = new IdentifyFile().Identify(getText(), "Paste");
-        SequenceI[] sequences = null;
+        Alignment al = null;
 
         if (FormatAdapter.isValidFormat(format))
         {
           try{
-            sequences = new FormatAdapter().readFile(getText(), "Paste", format);
+            al = new FormatAdapter().readFile(getText(), "Paste", format);
           }catch(java.io.IOException ex)
           {
             JOptionPane.showInternalMessageDialog(Desktop.desktop,
@@ -182,22 +185,24 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
           }
         }
 
-        if (sequences != null)
+        if (al != null)
         {
           if(viewport!=null)
           {
-            for(int i=0; i<sequences.length; i++)
-              viewport.getAlignment().addSequence(sequences[i]);
+            for(int i=0; i<al.getHeight(); i++)
+              viewport.getAlignment().addSequence(al.getSequenceAt(i));
 
             viewport.firePropertyChange("alignment", null, viewport.getAlignment().getSequences());
           }
           else
           {
-            AlignFrame af = new AlignFrame(new Alignment(sequences));
+            AlignFrame af = new AlignFrame(al,
+                                           AlignFrame.DEFAULT_WIDTH,
+                                           AlignFrame.DEFAULT_HEIGHT);
             af.currentFileFormat = format;
             Desktop.addInternalFrame(af, "Cut & Paste input - " + format,
-                                     AlignFrame.NEW_WINDOW_WIDTH,
-                                     AlignFrame.NEW_WINDOW_HEIGHT);
+                                     AlignFrame.DEFAULT_WIDTH,
+                                     AlignFrame.DEFAULT_HEIGHT);
             af.statusBar.setText("Successfully pasted alignment file");
 
             try