JAL-2371 rename global/viewportColourScheme to residueShading

[jalview.git] / src / jalview / gui / AlignViewport.java

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index ea9eb21..69f155b 100644 (file)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -295,18 +295,18 @@ public class AlignViewport extends AlignmentViewport implements
     {
       ColourSchemeI colourScheme = ColourSchemeProperty.getColourScheme(
               alignment, propertyValue);
-      globalColourScheme = new ResidueShader(colourScheme);
+      residueShading = new ResidueShader(colourScheme);
 
       if (colourScheme instanceof UserColourScheme)
       {
-        globalColourScheme = new ResidueShader(
+        residueShading = new ResidueShader(
                 UserDefinedColours.loadDefaultColours());
-        globalColourScheme.setThreshold(0, isIgnoreGapsConsensus());
+        residueShading.setThreshold(0, isIgnoreGapsConsensus());
       }
 
-      if (globalColourScheme != null)
+      if (residueShading != null)
       {
-        globalColourScheme.setConsensus(hconsensus);
+        residueShading.setConsensus(hconsensus);
       }
     }
   }
@@ -385,9 +385,9 @@ public class AlignViewport extends AlignmentViewport implements
     super.setViewStyle(settingsForView);
     setFont(new Font(viewStyle.getFontName(), viewStyle.getFontStyle(),
             viewStyle.getFontSize()), false);
-    if (globalColourScheme != null)
+    if (residueShading != null)
     {
-      globalColourScheme.setConservationApplied(settingsForView
+      residueShading.setConservationApplied(settingsForView
               .isConservationColourSelected());
     }
   }