JAL-2371 CollectionColourScheme renamed ResidueShader and moved to

[jalview.git] / src / jalview / viewmodel / AlignmentViewport.java

diff --git a/src/jalview/viewmodel/AlignmentViewport.java b/src/jalview/viewmodel/AlignmentViewport.java
index 69879b7..1352cf2 100644 (file)
--- a/src/jalview/viewmodel/AlignmentViewport.java
+++ b/src/jalview/viewmodel/AlignmentViewport.java
@@ -42,9 +42,9 @@ import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceCollectionI;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
+import jalview.renderer.ResidueShader;
+import jalview.renderer.ResidueShaderI;
 import jalview.schemes.Blosum62ColourScheme;
-import jalview.schemes.CollectionColourScheme;
-import jalview.schemes.CollectionColourSchemeI;
 import jalview.schemes.ColourSchemeI;
 import jalview.schemes.PIDColourScheme;
 import jalview.structure.CommandListener;
@@ -599,7 +599,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
 
   protected boolean ignoreGapsInConsensusCalculation = false;
 
-  protected CollectionColourSchemeI globalColourScheme;
+  protected ResidueShaderI globalColourScheme;
 
   @Override
   public void setGlobalColourScheme(ColourSchemeI cs)
@@ -619,7 +619,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
      */
     if (globalColourScheme == null)
     {
-      globalColourScheme = new CollectionColourScheme();
+      globalColourScheme = new ResidueShader();
     }
     globalColourScheme.setColourScheme(cs);
 
@@ -670,7 +670,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
   }
 
   @Override
-  public CollectionColourSchemeI getViewportColourScheme()
+  public ResidueShaderI getViewportColourScheme()
   {
     return globalColourScheme;
   }
@@ -1850,7 +1850,7 @@ public abstract class AlignmentViewport implements AlignViewportI,
    */
   void resetAllColourSchemes()
   {
-    CollectionColourSchemeI cs = globalColourScheme;
+    ResidueShaderI cs = globalColourScheme;
     if (cs != null)
     {
       cs.alignmentChanged(alignment, hiddenRepSequences);