X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FCutAndPasteTransfer.java;h=4773c260e64095030f56119bef694777ea86cd0a;hb=cca1d315fd19ddcc7c67a5aba91dafa98be097cf;hp=ba1e85edacfcfc3dc4b862872cbad112569e4e24;hpb=e8334005d46d1d4cc064250758068e5a390cff25;p=jalview.git

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index ba1e85e..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
@@ -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);
     }
 
@@ -88,6 +91,40 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
       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!
      *
@@ -133,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.formats.contains(format))
+        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,
@@ -148,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
@@ -173,15 +212,7 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
             catch (Exception ex)
             {
             }
-
           }
-            try
-            {
-                this.setClosed(true);
-            }
-            catch (Exception ex)
-            {
-            }
         }
     }