X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=be2cf97ed288f69feac883ff111f07a1a9beffb5;hb=848bef9fdc243cfab564acb0b82fc7ee3bcffe9f;hp=9e0dca4cb88d4e7480146b1433b8e94449d0857b;hpb=efc31b4a8d5cee63555586804a2b79c06bdb5a14;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 9e0dca4..be2cf97 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -39,6 +39,19 @@ import javax.swing.*;
  */
 public class CutAndPasteTransfer extends GCutAndPasteTransfer
 {
+
+  public CutAndPasteTransfer()
+  {
+    SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+        textarea.requestFocus();
+      }
+    });
+
+  }
+
     /**
      * DOCUMENT ME!
      */
@@ -67,6 +80,11 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
         textarea.setText(text);
     }
 
+    public void appendText(String text)
+    {
+      textarea.append(text);
+    }
+
     /**
      * DOCUMENT ME!
      *
@@ -74,8 +92,9 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
      */
     public void copyItem_actionPerformed(ActionEvent e)
     {
+        textarea.getSelectedText();
         Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
-        c.setContents(new StringSelection(textarea.getText()), null);
+        c.setContents(new StringSelection(textarea.getSelectedText()), null);
     }
 
     /**
@@ -95,7 +114,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
         try
         {
-            textarea.setText((String) contents.getTransferData(
+            textarea.append((String) contents.getTransferData(
                     DataFlavor.stringFlavor));
         }
         catch (Exception ex)
@@ -115,7 +134,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
         if (FormatAdapter.formats.contains(format))
         {
-            sequences = FormatAdapter.readFile(getText(), "Paste", format);
+            sequences = new FormatAdapter().readFile(getText(), "Paste", format);
         }
 
         if (sequences != null)
@@ -128,7 +147,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
             try
             {
-                af.setMaximum(Preferences.showFullscreen);
+                af.setMaximum( jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
             }
             catch (Exception ex)
             {
@@ -167,4 +186,31 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
         {
         }
     }
+
+    public void textarea_mousePressed(MouseEvent e)
+    {
+      if(SwingUtilities.isRightMouseButton(e))
+      {
+        JPopupMenu popup = new JPopupMenu("Edit");
+        JMenuItem item = new JMenuItem("Copy");
+        item.addActionListener(new ActionListener()
+            {public void actionPerformed(ActionEvent e)
+                  {
+                    copyItem_actionPerformed(e);
+                  }
+            });
+        popup.add(item);
+        item = new JMenuItem("Paste");
+        item.addActionListener(new ActionListener()
+            {public void actionPerformed(ActionEvent e)
+                  {
+                    pasteMenu_actionPerformed(e);
+                  }
+            });
+        popup.add(item);
+        popup.show(this, e.getX(), e.getY()+textarea.getY()+30);
+
+      }
+    }
+
 }