From c00cfcb9f2223f1225fba57e5de85141cfa4570c Mon Sep 17 00:00:00 2001 From: gmungoc Date: Fri, 10 Feb 2017 11:03:15 +0000 Subject: [PATCH] JAL-2371 small move of code, typo correction --- src/jalview/gui/AlignViewport.java | 5 ----- src/jalview/renderer/ResidueShader.java | 2 +- src/jalview/viewmodel/AlignmentViewport.java | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 499faaf..e0efa7c 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -384,11 +384,6 @@ public class AlignViewport extends AlignmentViewport implements super.setViewStyle(settingsForView); setFont(new Font(viewStyle.getFontName(), viewStyle.getFontStyle(), viewStyle.getFontSize()), false); - if (residueShading != null) - { - residueShading.setConservationApplied(settingsForView - .isConservationColourSelected()); - } } /** diff --git a/src/jalview/renderer/ResidueShader.java b/src/jalview/renderer/ResidueShader.java index 3f5cd11..b6f7fe6 100644 --- a/src/jalview/renderer/ResidueShader.java +++ b/src/jalview/renderer/ResidueShader.java @@ -47,7 +47,7 @@ public class ResidueShader implements ResidueShaderI private boolean conservationColouring; /* - * the phsyico-chemical property conservation scores for columns, with values + * the physico-chemical property conservation scores for columns, with values * 0-9, '+' (all properties conserved), '*' (residue fully conserved) or '-' (gap) * (may be null if colour by conservation is not selected) */ diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java index 8fa14ae..0c470fe 100644 --- a/src/jalview/viewmodel/AlignmentViewport.java +++ b/src/jalview/viewmodel/AlignmentViewport.java @@ -2430,6 +2430,11 @@ public abstract class AlignmentViewport implements AlignViewportI, public void setViewStyle(ViewStyleI settingsForView) { viewStyle = new ViewStyle(settingsForView); + if (residueShading != null) + { + residueShading.setConservationApplied(settingsForView + .isConservationColourSelected()); + } } @Override -- 1.7.10.2