From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 31 Jan 2007 15:29:13 +0000 (+0000)
Subject: Dont export annotations if not visible
X-Git-Tag: Release_2_3~405
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ad35f232acd499d9457056ca24b663866a09edd2;p=jalview.git

Dont export annotations if not visible
---

diff --git a/src/jalview/appletgui/AlignFrame.java b/src/jalview/appletgui/AlignFrame.java
index 74460f7..061cf0d 100755
--- a/src/jalview/appletgui/AlignFrame.java
+++ b/src/jalview/appletgui/AlignFrame.java
@@ -673,12 +673,11 @@ public void itemStateChanged(ItemEvent evt)
   public String outputAnnotations(boolean displayTextbox)
   {
     String annotation = new AnnotationFile().printAnnotations(
-      viewport.alignment.getAlignmentAnnotation(),
-       viewport.alignment.getGroups() );
+        viewport.showAnnotation ? viewport.alignment.getAlignmentAnnotation() : null,
+        viewport.alignment.getGroups());
 
     if(displayTextbox)
     {
-
       CutAndPasteTransfer cap = new CutAndPasteTransfer(false, this);
       Frame frame = new Frame();
       frame.add(cap);
diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 3082f74..1eb72e9 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -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()
         );
   }