Dont export annotations if not visible
authoramwaterhouse <Andrew Waterhouse>
Wed, 31 Jan 2007 15:29:13 +0000 (15:29 +0000)
committeramwaterhouse <Andrew Waterhouse>
Wed, 31 Jan 2007 15:29:13 +0000 (15:29 +0000)
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java

index 74460f7..061cf0d 100755 (executable)
@@ -673,12 +673,11 @@ public void itemStateChanged(ItemEvent evt)
   public String outputAnnotations(boolean displayTextbox)\r
   {\r
     String annotation = new AnnotationFile().printAnnotations(\r
-      viewport.alignment.getAlignmentAnnotation(),\r
-       viewport.alignment.getGroups() );\r
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,\r
+        viewport.alignment.getGroups());\r
 \r
     if(displayTextbox)\r
     {\r
-\r
       CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);\r
       Frame frame = new Frame();\r
       frame.add(cap);\r
index 3082f74..1eb72e9 100755 (executable)
@@ -36,8 +36,6 @@ import jalview.schemes.*;
 import jalview.commands.*;
 import jalview.ws.*;
 import java.awt.dnd.*;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
 
 /**
  * DOCUMENT ME!
@@ -856,9 +854,9 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener
   public void exportAnnotations_actionPerformed(ActionEvent e)
   {
     new AnnotationExporter().exportAnnotations(
-      alignPanel,
-      viewport.alignment.getAlignmentAnnotation(),
-      viewport.alignment.getGroups()
+        alignPanel,
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+        viewport.alignment.getGroups()
         );
   }