Merge develop to Release_2_8_3_Branch

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

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 8b0bafd..22f0a59 100644 (file)
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -20,16 +20,28 @@
  */
 package jalview.gui;
 
-import java.awt.*;
-import java.awt.datatransfer.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
-import jalview.io.*;
-import jalview.jbgui.*;
+import jalview.datamodel.Alignment;
+import jalview.io.FormatAdapter;
+import jalview.io.IdentifyFile;
+import jalview.io.JalviewFileChooser;
+import jalview.io.JalviewFileView;
+import jalview.jbgui.GCutAndPasteTransfer;
 import jalview.util.MessageManager;
 
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.StringSelection;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+
+import javax.swing.JMenuItem;
+import javax.swing.JOptionPane;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+
 /**
  * Cut'n'paste files into the desktop See JAL-1105
  * 
@@ -190,24 +202,19 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
     if (al != null)
     {
+      String title = MessageManager.formatMessage(
+              "label.input_cut_paste_params", new String[]
+              { format });
       if (viewport != null)
       {
-        for (int i = 0; i < al.getHeight(); i++)
-        {
-          viewport.getAlignment().addSequence(al.getSequenceAt(i));
-        }
-
-        viewport.firePropertyChange("alignment", null, viewport
-                .getAlignment().getSequences());
+        viewport.addAlignment(al, title);
       }
       else
       {
         AlignFrame af = new AlignFrame(al, AlignFrame.DEFAULT_WIDTH,
                 AlignFrame.DEFAULT_HEIGHT);
         af.currentFileFormat = format;
-        Desktop.addInternalFrame(af, MessageManager.formatMessage(
-                "label.input_cut_paste_params", new String[]
-                { format }), AlignFrame.DEFAULT_WIDTH,
+        Desktop.addInternalFrame(af, title, AlignFrame.DEFAULT_WIDTH,
                 AlignFrame.DEFAULT_HEIGHT);
         af.statusBar.setText(MessageManager
                 .getString("label.successfully_pasted_alignment_file"));