JAL-2371 small move of code, typo correction
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 10 Feb 2017 11:03:15 +0000 (11:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 10 Feb 2017 11:03:15 +0000 (11:03 +0000)
src/jalview/gui/AlignViewport.java
src/jalview/renderer/ResidueShader.java
src/jalview/viewmodel/AlignmentViewport.java

index 499faaf..e0efa7c 100644 (file)
@@ -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());
-    }
   }
 
   /**
index 3f5cd11..b6f7fe6 100644 (file)
@@ -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)
    */
index 8fa14ae..0c470fe 100644 (file)
@@ -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