From 3596077c79b7aa2051b9aaa978481004b513101c Mon Sep 17 00:00:00 2001 From: amwaterhouse Date: Mon, 7 Aug 2006 14:46:45 +0000 Subject: [PATCH] Set wrapped mode even if false --- src/jalview/gui/Jalview2XML.java | 15 +++++---------- src/jalview/gui/Jalview2XML_V1.java | 17 +++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/jalview/gui/Jalview2XML.java b/src/jalview/gui/Jalview2XML.java index 562d5cb..95912fe 100755 --- a/src/jalview/gui/Jalview2XML.java +++ b/src/jalview/gui/Jalview2XML.java @@ -1164,16 +1164,11 @@ public class Jalview2XML af.viewport.setWrapAlignment(view.getWrapAlignment()); af.wrapMenuItem.setSelected(view.getWrapAlignment()); - if (view.getWrapAlignment()) - { - af.alignPanel.setWrapAlignment(view.getWrapAlignment()); - } - else - { - af.annotationPanelMenuItem.setState(view.getShowAnnotation()); - af.viewport.setShowAnnotation(view.getShowAnnotation()); - af.alignPanel.setAnnotationVisible(view.getShowAnnotation()); - } + af.alignPanel.setWrapAlignment(view.getWrapAlignment()); + + af.annotationPanelMenuItem.setState(view.getShowAnnotation()); + af.viewport.setShowAnnotation(view.getShowAnnotation()); + af.alignPanel.setAnnotationVisible(view.getShowAnnotation()); af.viewport.setShowBoxes(view.getShowBoxes()); af.viewBoxesMenuItem.setSelected(view.getShowBoxes()); diff --git a/src/jalview/gui/Jalview2XML_V1.java b/src/jalview/gui/Jalview2XML_V1.java index 1ccf7e6..bb5a1ac 100755 --- 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()); af.wrapMenuItem.setSelected(view.getWrapAlignment()); - if (view.getWrapAlignment()) - { - af.alignPanel.setWrapAlignment(view.getWrapAlignment()); - } - else - { - af.annotationPanelMenuItem.setState(view.getShowAnnotation()); - af.viewport.setShowAnnotation(view.getShowAnnotation()); - af.alignPanel.setAnnotationVisible(view.getShowAnnotation()); - } + + af.alignPanel.setWrapAlignment(view.getWrapAlignment()); + + af.annotationPanelMenuItem.setState(view.getShowAnnotation()); + af.viewport.setShowAnnotation(view.getShowAnnotation()); + af.alignPanel.setAnnotationVisible(view.getShowAnnotation()); + af.viewport.setShowBoxes(view.getShowBoxes()); af.viewBoxesMenuItem.setSelected(view.getShowBoxes()); -- 1.7.10.2