Cut and paste may be inserted into Dialog frame

diff --git a/src/jalview/appletgui/CutAndPasteTransfer.java b/src/jalview/appletgui/CutAndPasteTransfer.java
index 173b031..4b890bb 100755 (executable)
--- a/src/jalview/appletgui/CutAndPasteTransfer.java
+++ b/src/jalview/appletgui/CutAndPasteTransfer.java
@@ -27,13 +27,12 @@ import jalview.io.*;
 \r
 public class CutAndPasteTransfer extends Panel implements ActionListener, MouseListener\r
 {\r
-  jalview.bin.JalviewLite applet;\r
-\r
   boolean pdbImport = false;\r
+  boolean treeImport = false;\r
   Sequence seq;\r
-  SeqCanvas seqcanvas;\r
+  AlignFrame alignFrame;\r
 \r
-  public CutAndPasteTransfer(boolean forImport, jalview.bin.JalviewLite mainApplet)\r
+  public CutAndPasteTransfer(boolean forImport, AlignFrame alignFrame)\r
   {\r
     try {\r
         jbInit();\r
@@ -41,7 +40,7 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
         e.printStackTrace();\r
     }\r
 \r
-    applet = mainApplet;\r
+    this.alignFrame = alignFrame;\r
 \r
     if (!forImport)\r
     {\r
@@ -49,14 +48,6 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
     }\r
   }\r
 \r
-  public void setPDBImport(Sequence seq, SeqCanvas seqcanvas)\r
-  {\r
-    this.seq = seq;\r
-    this.seqcanvas = seqcanvas;\r
-    pdbImport = true;\r
-  }\r
-\r
-\r
   public String getText()\r
   {\r
     return textarea.getText();\r
@@ -67,6 +58,13 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
     textarea.setText(text);\r
   }\r
 \r
+  public void setPDBImport(Sequence seq)\r
+  {\r
+    this.seq = seq;\r
+    pdbImport = true;\r
+  }\r
+\r
+\r
   public void actionPerformed(ActionEvent evt)\r
   {\r
     if(evt.getSource()==ok)\r
@@ -96,9 +94,28 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
 \r
     if(pdbImport)\r
     {\r
-      new MCview.AppletPDBViewer(text, AppletFormatAdapter.PASTE, seq, seqcanvas);\r
+      new MCview.AppletPDBViewer(text, AppletFormatAdapter.PASTE,\r
+                                 seq,\r
+                                 alignFrame.getSeqcanvas());\r
     }\r
-    else\r
+    else if(treeImport)\r
+    {\r
+      try{\r
+        jalview.io.NewickFile fin = new jalview.io.NewickFile(textarea.getText(),\r
+            "Paste");\r
+\r
+        fin.parse();\r
+        if(fin.getTree()!=null)\r
+          alignFrame.loadTree(fin, "Pasted tree file");\r
+\r
+      }\r
+      catch (Exception ex)\r
+      {\r
+        textarea.setText("Could not parse Newick file!\n" + ex);\r
+        return;\r
+      }\r
+    }\r
+    else if(alignFrame!=null)\r
     {\r
       SequenceI[] sequences = null;\r
 \r
@@ -111,18 +128,26 @@ public class CutAndPasteTransfer extends Panel implements ActionListener, MouseL
       }\r
       if (sequences != null)\r
       {\r
-        AlignFrame af = new AlignFrame(new Alignment(sequences), applet,\r
-                                       "Cut & Paste input - " + format);\r
+        AlignFrame af = new AlignFrame(new Alignment(sequences), alignFrame.applet,\r
+                                       "Cut & Paste input - " + format,\r
+                                       false);\r
         af.statusBar.setText("Successfully pasted alignment file");\r
       }\r
     }\r
 \r
+   if(this.getParent() instanceof Frame)\r
     ((Frame)this.getParent()).setVisible(false);\r
+   else\r
+     ((Dialog)this.getParent()).setVisible(false);\r
   }\r
 \r
   protected void cancel_actionPerformed()\r
   {\r
-    ((Frame)this.getParent()).setVisible(false);\r
+    textarea.setText("");\r
+    if(this.getParent() instanceof Frame)\r
+     ((Frame)this.getParent()).setVisible(false);\r
+    else\r
+     ((Dialog)this.getParent()).setVisible(false);\r
   }\r
 \r
   protected TextArea textarea = new TextArea();\r