DONT SHOW ANNOTATIONS IF WRAPPED

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