X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=7a3eb98937adc7750bcad8eb7830eb2028bce938;hb=6fc9aca27f606f6e3a0121597896e1a5dae35c36;hp=219ad4bf38a0494d20a23b1f93253b12eda6ec1e;hpb=008ad05ffd2964c864cdab0f18dff2fb36c82242;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 219ad4b..7a3eb98 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -29,7 +29,6 @@ import java.awt.datatransfer.*;
 import java.awt.event.*;
 
 import javax.swing.*;
-import javax.swing.event.InternalFrameEvent;
 
 
 /**
@@ -40,19 +39,25 @@ import javax.swing.event.InternalFrameEvent;
  */
 public class CutAndPasteTransfer extends GCutAndPasteTransfer
 {
+
+  public CutAndPasteTransfer()
+  {
+    SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+        textarea.requestFocus();
+      }
+    });
+
+  }
+
     /**
      * DOCUMENT ME!
      */
     public void setForInput()
     {
         getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
-          SwingUtilities.invokeLater(new Runnable()
-          {
-            public void run()
-            {
-              textarea.requestFocus();
-            }
-          });
     }
 
     /**
@@ -75,6 +80,11 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
         textarea.setText(text);
     }
 
+    public void appendText(String text)
+    {
+      textarea.append(text);
+    }
+
     /**
      * DOCUMENT ME!
      *
@@ -82,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);
     }
 
     /**
@@ -103,7 +114,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
 
         try
         {
-            textarea.setText((String) contents.getTransferData(
+            textarea.append((String) contents.getTransferData(
                     DataFlavor.stringFlavor));
         }
         catch (Exception ex)
@@ -118,12 +129,20 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
      */
     public void ok_actionPerformed(ActionEvent e)
     {
-        String format = IdentifyFile.Identify(getText(), "Paste");
+        String format = new IdentifyFile().Identify(getText(), "Paste");
         SequenceI[] sequences = null;
 
         if (FormatAdapter.formats.contains(format))
         {
+          try{
             sequences = new FormatAdapter().readFile(getText(), "Paste", format);
+          }catch(java.io.IOException ex)
+          {
+            JOptionPane.showInternalMessageDialog(Desktop.desktop,
+                                                  "Couldn't read the pasted text.\n" +ex.toString(),
+                                                  "Error parsing text",
+                                                  JOptionPane.WARNING_MESSAGE);
+          }
         }
 
         if (sequences != null)
@@ -150,14 +169,6 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
             {
             }
         }
-        else
-        {
-            JOptionPane.showInternalMessageDialog(Desktop.desktop,
-                "Couldn't read the pasted text.\n" +
-                "Formats currently supported are\n" +
-                "Fasta, MSF, Clustal, BLC, PIR, MSP, and PFAM",
-                "Error parsing text", JOptionPane.WARNING_MESSAGE);
-        }
     }
 
     /**
@@ -175,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()+10, e.getY()+textarea.getY()+40);
+
+      }
+    }
+
 }