X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAlignFrame.java;h=70306374540c6bbad68feb559544884f985535df;hb=7dd9c4874042f584dc1feb6a345fe929a8509e2b;hp=8f8ac5a027be59dd45a684cde4a8b7e04401e3b1;hpb=f0ed39b35bf7581ff35bfeb52bb2403c179060c0;p=jalview.git

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 8f8ac5a..7030637 100644
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -1032,7 +1032,7 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
 
   private Hashtable getDisplayedFeatureCols()
   {
-    if (alignPanel.getFeatureRenderer() != null)
+    if (alignPanel.getFeatureRenderer() != null && viewport.featuresDisplayed!=null)
     {
       FeatureRenderer fr = alignPanel.getFeatureRenderer();
       Hashtable fcols = new Hashtable();
@@ -1065,12 +1065,25 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
 
     if (displayTextbox)
     {
-      CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
+      boolean frimport=false;
+      if (features==null || features.equals("No Features Visible"))
+      {
+        features = "# No features visible - paste some and import them here.";
+        frimport=true;
+      }
+      
+      CutAndPasteTransfer cap = new CutAndPasteTransfer(frimport, this);
+      if (frimport)
+      {
+        cap.setAnnotationImport();
+      }
       Frame frame = new Frame();
       frame.add(cap);
       jalview.bin.JalviewLite.addFrame(frame, "Features", 600, 500);
-
       cap.setText(features);
+    } else {
+      if (features==null)
+        features = "";
     }
 
     return features;
@@ -3543,4 +3556,18 @@ public class AlignFrame extends EmbmenuFrame implements ActionListener,
   {
     alignPanel.seqPanel.scrollTo(row, column);    
   }
+  public void scrollToRow(int row)
+  {
+    alignPanel.seqPanel.scrollToRow(row);    
+  }
+  public void scrollToColumn(int column)
+  {
+    alignPanel.seqPanel.scrollToColumn(column);    
+  }
+  /**
+   * @return the alignments unique ID.
+   */
+  public String getSequenceSetId() {
+    return viewport.getSequenceSetId();
+  }
 }