Set wrapped mode even if false

diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java
index 562d5cb..95912fe 100755 (executable)
--- a/src/jalview/gui/Jalview2XML.java
+++ b/src/jalview/gui/Jalview2XML.java
@@ -1164,16 +1164,11 @@ public class Jalview2XML
         af.viewport.setWrapAlignment(view.getWrapAlignment());\r
         af.wrapMenuItem.setSelected(view.getWrapAlignment());\r
 \r
-        if (view.getWrapAlignment())\r
-        {\r
-            af.alignPanel.setWrapAlignment(view.getWrapAlignment());\r
-        }\r
-        else\r
-        {\r
-            af.annotationPanelMenuItem.setState(view.getShowAnnotation());\r
-            af.viewport.setShowAnnotation(view.getShowAnnotation());\r
-            af.alignPanel.setAnnotationVisible(view.getShowAnnotation());\r
-        }\r
+        af.alignPanel.setWrapAlignment(view.getWrapAlignment());\r
+\r
+        af.annotationPanelMenuItem.setState(view.getShowAnnotation());\r
+        af.viewport.setShowAnnotation(view.getShowAnnotation());\r
+        af.alignPanel.setAnnotationVisible(view.getShowAnnotation());\r
 \r
         af.viewport.setShowBoxes(view.getShowBoxes());\r
         af.viewBoxesMenuItem.setSelected(view.getShowBoxes());\r

diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java
index 1ccf7e6..bb5a1ac 100755 (executable)
--- a/src/jalview/gui/Jalview2XML_V1.java
+++ b/src/jalview/gui/Jalview2XML_V1.java
@@ -359,16 +359,13 @@ public class Jalview2XML_V1
         af.viewport.setWrapAlignment(view.getWrapAlignment());\r
         af.wrapMenuItem.setSelected(view.getWrapAlignment());\r
 \r
-        if (view.getWrapAlignment())\r
-        {\r
-            af.alignPanel.setWrapAlignment(view.getWrapAlignment());\r
-        }\r
-        else\r
-        {\r
-            af.annotationPanelMenuItem.setState(view.getShowAnnotation());\r
-            af.viewport.setShowAnnotation(view.getShowAnnotation());\r
-            af.alignPanel.setAnnotationVisible(view.getShowAnnotation());\r
-        }\r
+\r
+        af.alignPanel.setWrapAlignment(view.getWrapAlignment());\r
+\r
+        af.annotationPanelMenuItem.setState(view.getShowAnnotation());\r
+        af.viewport.setShowAnnotation(view.getShowAnnotation());\r
+        af.alignPanel.setAnnotationVisible(view.getShowAnnotation());\r
+\r
 \r
         af.viewport.setShowBoxes(view.getShowBoxes());\r
         af.viewBoxesMenuItem.setSelected(view.getShowBoxes());\r