From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 6 Jun 2005 10:00:32 +0000 (+0000)
Subject: closes if accepted
X-Git-Tag: Release_2_0~111
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=fc798f10d356073d76d180342d232c31597a3b4f

closes if accepted
---

diff --git a/src/jalview/gui/CutAndPasteTransfer.java b/src/jalview/gui/CutAndPasteTransfer.java
index 327609a..5f615f4 100755
--- a/src/jalview/gui/CutAndPasteTransfer.java
+++ b/src/jalview/gui/CutAndPasteTransfer.java
@@ -66,17 +66,31 @@ public class CutAndPasteTransfer extends GCutAndPasteTransfer
         {
           AlignFrame af = new AlignFrame(new Alignment(sequences));
           af.currentFileFormat = format;
-          Desktop.addInternalFrame(af, "Cut & Paste input - "+format,
-                           AlignFrame.NEW_WINDOW_WIDTH,
-                           AlignFrame.NEW_WINDOW_HEIGHT);
+          Desktop.addInternalFrame(af, "Cut & Paste input - " + format,
+                                   AlignFrame.NEW_WINDOW_WIDTH,
+                                   AlignFrame.NEW_WINDOW_HEIGHT);
           af.statusBar.setText("Successfully pasted alignment file");
+          try
+          {  af.setMaximum(Preferences.showFullscreen);    }
+          catch (Exception ex)
+          {}
+          try
+          {
+            this.setClosed(true);
+          }
+          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);
-
+          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);
   }
 
   public void cancel_actionPerformed(ActionEvent e)
diff --git a/src/jalview/jbgui/GCutAndPasteTransfer.java b/src/jalview/jbgui/GCutAndPasteTransfer.java
index 32fb570..e9a0164 100755
--- a/src/jalview/jbgui/GCutAndPasteTransfer.java
+++ b/src/jalview/jbgui/GCutAndPasteTransfer.java
@@ -11,7 +11,9 @@ package jalview.jbgui;
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
-
+import java.beans.VetoableChangeListener;
+import java.beans.PropertyChangeEvent;
+import java.beans.PropertyVetoException;
 
 public class GCutAndPasteTransfer extends JInternalFrame
 {
@@ -60,9 +62,23 @@ public class GCutAndPasteTransfer extends JInternalFrame
       }
     });
     textarea.setBorder(null);
+    textarea.addVetoableChangeListener(new VetoableChangeListener()
+    {
+      public void vetoableChange(PropertyChangeEvent evt)
+      {
+        try
+        {
+          textarea_vetoableChange(evt);
+        }
+        catch (java.beans.PropertyVetoException exception0)
+        {
+          exception0.printStackTrace();
+        }
+
+      }
+    });
     editMenubar.add(editMenu);
     textarea.setFont(new java.awt.Font("Verdana", 0, 12));
-    textarea.setText("Paste your alignment file here");
     textarea.addMouseListener(new java.awt.event.MouseAdapter()
     {
       public void mousePressed(MouseEvent e)
@@ -124,4 +140,10 @@ public class GCutAndPasteTransfer extends JInternalFrame
 
   }
 
+  public void textarea_vetoableChange(PropertyChangeEvent evt)
+      throws PropertyVetoException
+  {
+
+  }
+
 }