Jalview-JS/JAL-3253-applet additional static final preferences

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

diff --git a/src/jalview/gui/ColourMenuHelper.java b/src/jalview/gui/ColourMenuHelper.java
index 7c3107e..5528e75 100644 (file)
--- a/src/jalview/gui/ColourMenuHelper.java
+++ b/src/jalview/gui/ColourMenuHelper.java
@@ -1,3 +1,23 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.gui;
 
 import jalview.bin.Cache;
@@ -101,8 +121,7 @@ public class ColourMenuHelper
        */
       final String name = scheme.getSchemeName();
       String label = MessageManager.getStringOrReturn(
-              "label.colourScheme_" + name.toLowerCase().replace(" ", "_"),
-              name);
+              "label.colourScheme_", name);
       final JRadioButtonMenuItem radioItem = new JRadioButtonMenuItem(
               label);
       radioItem.setName(name);
@@ -139,7 +158,7 @@ public class ColourMenuHelper
             ActionListener al = radioItem.getActionListeners()[0];
             radioItem.removeActionListener(al);
             int option = JvOptionPane.showInternalConfirmDialog(
-                    Desktop.desktop,
+                    Desktop.getDesktopPane(),
                     MessageManager
                             .getString("label.remove_from_default_list"),
                     MessageManager
@@ -262,7 +281,7 @@ public class ColourMenuHelper
   static void updatePreferences()
   {
     StringBuilder coloursFound = new StringBuilder();
-    String[] files = Cache.getProperty("USER_DEFINED_COLOURS").split("\\|");
+    String[] files = Cache.getProperty(Preferences.USER_DEFINED_COLOURS).split("\\|");
 
     /*
      * the property does not include the scheme name, it is in the file;
@@ -291,11 +310,11 @@ public class ColourMenuHelper
 
     if (coloursFound.toString().length() > 1)
     {
-      Cache.setProperty("USER_DEFINED_COLOURS", coloursFound.toString());
+      Cache.setProperty(Preferences.USER_DEFINED_COLOURS, coloursFound.toString());
     }
     else
     {
-      Cache.applicationProperties.remove("USER_DEFINED_COLOURS");
+      Cache.removePropertyNoSave(Preferences.USER_DEFINED_COLOURS);
     }
   }
 }