From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 6 Apr 2005 17:10:14 +0000 (+0000)
Subject: DONT SHOW ANNOTATIONS IF WRAPPED
X-Git-Tag: Release_2_0~487
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=68b562186d5887d587e409780f898d3417cb9bf3;p=jalview.git

DONT SHOW ANNOTATIONS IF WRAPPED
---

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index 5ee6c62..1324173 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -84,6 +84,13 @@ public class AlignFrame extends GAlignFrame
     else if(e.getActionCommand().equals("PFAM"))
       suffix = new String[]{"pfam"};
 
+    if(e.getActionCommand().equals("XML DUMP"))
+    {
+      XMLStore store = new XMLStore();
+      store.store(viewport);
+      return;
+    }
+
     JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY")
         , suffix, e.getActionCommand()+" file");
     chooser.setFileView(new JalviewFileView());
@@ -577,7 +584,6 @@ public class AlignFrame extends GAlignFrame
 
   public void font_actionPerformed(ActionEvent e)
   {
-   // JOptionPane op = new JOptionPane();
     JInternalFrame frame = new JInternalFrame();
     FontChooser fc = new FontChooser( alignPanel, frame );
     frame.setContentPane(fc);
@@ -637,6 +643,12 @@ public class AlignFrame extends GAlignFrame
 
   public void annotationPanelMenuItem_actionPerformed(ActionEvent e)
   {
+    if(annotationPanelMenuItem.isSelected() && viewport.getWrapAlignment())
+    {
+      annotationPanelMenuItem.setSelected(false);
+      return;
+    }
+    viewport.setShowAnnotation( annotationPanelMenuItem.isSelected() );
     alignPanel.setAnnotationVisible( annotationPanelMenuItem.isSelected() );
   }