X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=d88c861c11af019a66a704233f74ab49cb2287ba;hb=dfd021096780038aa9389ed96f6ce938244f95c4;hp=4777c85c8aeb76cd4530c9da52a385d421e9b350;hpb=b0cee3aaf7d8873910939f97b6acb217d518968d;p=jalview.git diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java index 4777c85..d88c861 100755 --- a/src/jalview/gui/Preferences.java +++ b/src/jalview/gui/Preferences.java @@ -34,7 +34,8 @@ import jalview.io.JalviewFileChooser; import jalview.io.JalviewFileView; import jalview.jbgui.GPreferences; import jalview.jbgui.GSequenceLink; -import jalview.schemes.JalviewColourScheme; +import jalview.schemes.ColourSchemeI; +import jalview.schemes.ColourSchemes; import jalview.schemes.ResidueColourScheme; import jalview.util.MessageManager; import jalview.util.Platform; @@ -293,13 +294,11 @@ public class Preferences extends GPreferences */ protColour.addItem(ResidueColourScheme.NONE); nucColour.addItem(ResidueColourScheme.NONE); - for (JalviewColourScheme cs : JalviewColourScheme.values()) + for (ColourSchemeI cs : ColourSchemes.getInstance().getColourSchemes()) { - if (cs != JalviewColourScheme.UserDefined) - { - protColour.addItem(cs.toString()); - nucColour.addItem(cs.toString()); - } + String name = cs.getSchemeName(); + protColour.addItem(name); + nucColour.addItem(name); } String oldProp = Cache.getDefault(DEFAULT_COLOUR, ResidueColourScheme.NONE);