X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FCutAndPasteTransfer.java;h=ec31b0a7cfe3acee7e9048bdd5d7d22ee1a92db7;hb=d6509fcf3a8cc90616e18cb22cec97f85c722bb8;hp=c09784effa088b791dabbe33a33a68ad47c573cc;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git

diff --git a/src/jalview/appletgui/CutAndPasteTransfer.java b/src/jalview/appletgui/CutAndPasteTransfer.java
index c09784e..ec31b0a 100755
--- a/src/jalview/appletgui/CutAndPasteTransfer.java
+++ b/src/jalview/appletgui/CutAndPasteTransfer.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -22,6 +22,7 @@ import java.awt.event.*;
 
 import jalview.datamodel.*;
 import jalview.io.*;
+import jalview.schemes.TCoffeeColourScheme;
 
 public class CutAndPasteTransfer extends Panel implements ActionListener,
         MouseListener
@@ -150,24 +151,64 @@ public class CutAndPasteTransfer extends Panel implements ActionListener,
 
       } catch (Exception ex)
       {
+        // TODO: JAL-1102 - should have a warning message in dialog, not simply overwrite the broken input data with the exception
         textarea.setText("Could not parse Newick file!\n" + ex);
         return;
       }
     }
     else if (annotationImport)
     {
-      if (new AnnotationFile().readAnnotationFile(
-              alignFrame.viewport.alignment, textarea.getText(),
-              jalview.io.AppletFormatAdapter.PASTE))
+      TCoffeeScoreFile tcf = null;
+      try
       {
-        alignFrame.alignPanel.fontChanged();
-        alignFrame.alignPanel.setScrollValues(0, 0);
-
+        tcf = new TCoffeeScoreFile(textarea.getText(),
+                jalview.io.AppletFormatAdapter.PASTE);
+        if (tcf.isValid())
+        {
+          if (tcf.annotateAlignment(alignFrame.viewport.getAlignment(),
+                  true))
+          {
+            alignFrame.tcoffeeColour.setEnabled(true);
+            alignFrame.alignPanel.fontChanged();
+            alignFrame.changeColour(new TCoffeeColourScheme(
+                    alignFrame.viewport.getAlignment()));
+            alignFrame.statusBar
+                    .setText("Successfully pasted T-Coffee scores to alignment.");
+          }
+          else
+          {
+            // file valid but didn't get added to alignment for some reason
+            alignFrame.statusBar.setText("Failed to add T-Coffee scores: "+(tcf.getWarningMessage()!=null ? tcf.getWarningMessage():""));
+          }
+        }
+        else
+        {
+          tcf = null;
+        }
+      } catch (Exception x)
+      {
+        tcf = null;
       }
-      else
+      if (tcf == null)
       {
-        alignFrame.parseFeaturesFile(textarea.getText(),
-                jalview.io.AppletFormatAdapter.PASTE);
+        if (new AnnotationFile().readAnnotationFile(
+                alignFrame.viewport.getAlignment(), textarea.getText(),
+                jalview.io.AppletFormatAdapter.PASTE))
+        {
+          alignFrame.alignPanel.fontChanged();
+          alignFrame.alignPanel.setScrollValues(0, 0);
+          alignFrame.statusBar
+                  .setText("Successfully pasted annotation to alignment.");
+
+        }
+        else
+        {
+          if (!alignFrame.parseFeaturesFile(textarea.getText(),
+                  jalview.io.AppletFormatAdapter.PASTE))
+          {
+            alignFrame.statusBar.setText("Couldn't parse pasted text as a valid annotation, feature, GFF, or T-Coffee score file.");
+          }
+        }
       }
     }
     else if (alignFrame != null)
@@ -196,10 +237,13 @@ public class CutAndPasteTransfer extends Panel implements ActionListener,
         else
         {
           alignFrame.addSequences(al.getSequencesArray());
+          alignFrame.statusBar
+                  .setText("Successfully pasted alignment file");
         }
       }
     }
-
+    // TODO: dialog should indicate if data was parsed correctly or not - see
+    // JAL-1102
     if (this.getParent() instanceof Frame)
     {
       ((Frame) this.getParent()).setVisible(false);