JAL-2360 ColourSchemes holds configured schemes, AlignFrame colour menu

[jalview.git] / src / jalview / gui / Preferences.java

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 4777c85..d88c861 100755 (executable)
--- 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);