Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

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

diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java
index 4bd77b6..9e82ae5 100644 (file)
--- a/src/jalview/appletgui/AlignViewport.java
+++ b/src/jalview/appletgui/AlignViewport.java
@@ -208,8 +208,8 @@ public class AlignViewport extends AlignmentViewport implements
 
       if (colour != null)
       {
-        globalColourScheme = ColourSchemeProperty.getColour(alignment,
-                colour);
+        globalColourScheme = ColourSchemeProperty.getColourScheme(
+                alignment, colour);
         if (globalColourScheme != null)
         {
           globalColourScheme.setConsensus(hconsensus);
@@ -218,8 +218,8 @@ public class AlignViewport extends AlignmentViewport implements
 
       if (applet.getParameter("userDefinedColour") != null)
       {
-        ((UserColourScheme) globalColourScheme).parseAppletParameter(applet
-                .getParameter("userDefinedColour"));
+        globalColourScheme = new UserColourScheme(
+                applet.getParameter("userDefinedColour"));
       }
     }
     initAutoAnnotation();