X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FAlignViewport.java;fp=src%2Fjalview%2Fappletgui%2FAlignViewport.java;h=2e76e1aece976095f614ed165759c257d98c1240;hb=8e1be43e250107a4d86898bd554cf03098fa5957;hp=9e82ae5cffaebe5f5e2c7a26d3af828ec30d5c4d;hpb=8b55eedb9d76a8c65b80f756c4412bf029906bf7;p=jalview.git diff --git a/src/jalview/appletgui/AlignViewport.java b/src/jalview/appletgui/AlignViewport.java index 9e82ae5..2e76e1a 100644 --- 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();