From d19f6b27ef8ee7350763cfaa511270bf128e76a9 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Mon, 29 Aug 2005 17:22:17 +0000
Subject: [PATCH] Include None in default colours

---
 src/jalview/gui/Preferences.java |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index bec82a5..be1455b 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -93,21 +93,14 @@ public class Preferences extends GPreferences
         quality.setSelected(Cache.getDefault("SHOW_QUALITY", true));
         identity.setSelected(Cache.getDefault("SHOW_IDENTITY", true));
 
-        for (int i = 0; i < 12; i++)
+        for (int i = 0; i < 13; i++)
         {
             colour.addItem(ColourSchemeProperty.getColourName(i));
         }
 
-        String string = Cache.getProperty("DEFAULT_COLOUR");
+        String string = Cache.getDefault("DEFAULT_COLOUR", "None");
 
-        if (string != null)
-        {
-            colour.setSelectedItem(string);
-        }
-        else
-        {
-            colour.setSelectedIndex(11);
-        }
+        colour.setSelectedItem(string);
 
         String[] fonts = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
                                                      .getAvailableFontFamilyNames();
-- 
1.7.10.2