JAL-2371 CollectionColourScheme renamed ResidueShader and moved to

[jalview.git] / src / jalview / datamodel / SequenceGroup.java

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index c77569e..a1579c5 100755 (executable)
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -22,8 +22,8 @@ package jalview.datamodel;
 
 import jalview.analysis.AAFrequency;
 import jalview.analysis.Conservation;
-import jalview.schemes.CollectionColourScheme;
-import jalview.schemes.CollectionColourSchemeI;
+import jalview.renderer.ResidueShader;
+import jalview.renderer.ResidueShaderI;
 import jalview.schemes.ColourSchemeI;
 
 import java.awt.Color;
@@ -71,7 +71,7 @@ public class SequenceGroup implements AnnotatedCollectionI
   /**
    * Colourscheme applied to group if any
    */
-  public CollectionColourSchemeI cs;
+  public ResidueShaderI cs;
 
   // start column (base 0)
   int startRes = 0;
@@ -118,7 +118,7 @@ public class SequenceGroup implements AnnotatedCollectionI
   public SequenceGroup()
   {
     groupName = "JGroup:" + this.hashCode();
-    cs = new CollectionColourScheme();
+    cs = new ResidueShader();
   }
 
   /**
@@ -145,7 +145,7 @@ public class SequenceGroup implements AnnotatedCollectionI
     this.displayBoxes = displayBoxes;
     this.displayText = displayText;
     this.colourText = colourText;
-    this.cs = new CollectionColourScheme(scheme);
+    this.cs = new ResidueShader(scheme);
     startRes = start;
     endRes = end;
     recalcConservation();
@@ -1371,12 +1371,12 @@ public class SequenceGroup implements AnnotatedCollectionI
   {
     if (cs == null)
     {
-      cs = new CollectionColourScheme();
+      cs = new ResidueShader();
     }
     cs.setColourScheme(scheme);
   }
 
-  public void setGroupColourScheme(CollectionColourSchemeI scheme)
+  public void setGroupColourScheme(ResidueShaderI scheme)
   {
     cs = scheme;
   }
@@ -1386,7 +1386,7 @@ public class SequenceGroup implements AnnotatedCollectionI
     return cs == null ? null : cs.getColourScheme();
   }
 
-  public CollectionColourSchemeI getGroupColourScheme()
+  public ResidueShaderI getGroupColourScheme()
   {
     return cs;
   }