X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=4773c260e64095030f56119bef694777ea86cd0a;hb=182d6f907cbe252b377af82f0ab58dfd83c6d9b7;hp=db6fb186c78d941e3901f2ff9a9a7f5884a8b859;hpb=f24dacb1da56fccf05d684e2f4899facec2aecf7;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index db6fb18..4773c26 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -39,19 +39,31 @@ import javax.swing.*;
  */
 public class CutAndPasteTransfer extends GCutAndPasteTransfer
 {
+
+  AlignViewport viewport;
+
+  public CutAndPasteTransfer()
+  {
+    SwingUtilities.invokeLater(new Runnable()
+    {
+      public void run()
+      {
+        textarea.requestFocus();
+      }
+    });
+
+  }
+
     /**
      * DOCUMENT ME!
      */
-    public void setForInput()
+    public void setForInput(AlignViewport viewport)
     {
-        getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
-          SwingUtilities.invokeLater(new Runnable()
-          {
-            public void run()
-            {
-              textarea.requestFocus();
-            }
-          });
+      this.viewport = viewport;
+      if(viewport!=null)
+        ok.setText("Add");
+
+      getContentPane().add(inputButtonPanel, java.awt.BorderLayout.SOUTH);
     }
 
     /**
@@ -74,6 +86,45 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
         textarea.setText(text);
     }
 
+    public void appendText(String text)
+    {
+      textarea.append(text);
+    }
+
+
+    public void save_actionPerformed(ActionEvent e)
+    {
+      JalviewFileChooser chooser = new JalviewFileChooser(
+          jalview.bin.Cache.getProperty(
+              "LAST_DIRECTORY"));
+
+      chooser.setAcceptAllFileFilterUsed(false);
+      chooser.setFileView(new JalviewFileView());
+      chooser.setDialogTitle("Save Text to File");
+      chooser.setToolTipText("Save");
+
+      int value = chooser.showSaveDialog(this);
+
+      if (value == JalviewFileChooser.APPROVE_OPTION)
+      {
+        try
+        {
+          java.io.PrintWriter out = new java.io.PrintWriter(
+              new java.io.FileWriter(chooser.getSelectedFile()));
+
+          out.print(getText());
+          out.close();
+        }
+        catch (Exception ex)
+        {
+          ex.printStackTrace();
+        }
+
+      }
+    }
+
+
+
     /**
      * DOCUMENT ME!
      *
@@ -81,8 +132,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);
     }
 
     /**
@@ -117,45 +169,50 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
      */
     public void ok_actionPerformed(ActionEvent e)
     {
-        String format = IdentifyFile.Identify(getText(), "Paste");
-        SequenceI[] sequences = null;
+        String format = new IdentifyFile().Identify(getText(), "Paste");
+        Alignment al = null;
 
-        if (FormatAdapter.formats.contains(format))
+        if (FormatAdapter.isValidFormat(format))
         {
-            sequences = new FormatAdapter().readFile(getText(), "Paste", format);
+          try{
+            al = 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)
+        if (al != null)
         {
-            AlignFrame af = new AlignFrame(new Alignment(sequences));
+          if(viewport!=null)
+          {
+            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(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
             {
-                af.setMaximum( jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
-            }
-            catch (Exception ex)
-            {
-            }
-
-            try
-            {
-                this.setClosed(true);
+              af.setMaximum(jalview.bin.Cache.getDefault("SHOW_FULLSCREEN", false));
             }
             catch (Exception ex)
             {
             }
-        }
-        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);
+          }
         }
     }
 
@@ -196,7 +253,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
                   }
             });
         popup.add(item);
-        popup.show(this, e.getX(), e.getY()+textarea.getY()+30);
+        popup.show(this, e.getX()+10, e.getY()+textarea.getY()+40);
 
       }
     }