JAL-2371 CollectionColourScheme wraps ColourSchemeI

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

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 9e82ae5..2e76e1a 100644 (file)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -32,6 +32,7 @@ import jalview.datamodel.SearchResultsI;
 import jalview.datamodel.Sequence;
 import jalview.datamodel.SequenceGroup;
 import jalview.datamodel.SequenceI;
+import jalview.schemes.CollectionColourScheme;
 import jalview.schemes.ColourSchemeProperty;
 import jalview.schemes.UserColourScheme;
 import jalview.structure.CommandListener;
@@ -208,8 +209,8 @@ public class AlignViewport extends AlignmentViewport implements
 
       if (colour != null)
       {
-        globalColourScheme = ColourSchemeProperty.getColourScheme(
-                alignment, colour);
+        globalColourScheme = new CollectionColourScheme(
+                ColourSchemeProperty.getColourScheme(alignment, colour));
         if (globalColourScheme != null)
         {
           globalColourScheme.setConsensus(hconsensus);
@@ -218,8 +219,9 @@ public class AlignViewport extends AlignmentViewport implements
 
       if (applet.getParameter("userDefinedColour") != null)
       {
-        globalColourScheme = new UserColourScheme(
-                applet.getParameter("userDefinedColour"));
+        globalColourScheme = new CollectionColourScheme(
+                new UserColourScheme(
+                        applet.getParameter("userDefinedColour")));
       }
     }
     initAutoAnnotation();