X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FUserDefinedColours.java;fp=src%2Fjalview%2Fgui%2FUserDefinedColours.java;h=4846049f7402db6caafbe70554eba2f01a597e27;hb=4f77328104498504339216829abf5ea87e2791ec;hp=6e3a68be104ad7bed96110cb40e435c82a587d07;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 6e3a68b..4846049 100755
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -69,6 +69,8 @@ public class UserDefinedColours extends GUserDefinedColours
   private static final Font VERDANA_BOLD_10 = new Font("Verdana", Font.BOLD,
           10);
 
+  public static final String USER_DEFINED_COLOURS = "USER_DEFINED_COLOURS";
+
   private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
 
   private static final int MY_FRAME_HEIGHT = 440;
@@ -446,7 +448,7 @@ public class UserDefinedColours extends GUserDefinedColours
   {
     if (isNoSelectionMade())
     {
-      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(),
+      JvOptionPane.showMessageDialog(Desktop.desktop,
               MessageManager
                       .getString("label.no_colour_selection_in_scheme"),
               MessageManager.getString("label.no_colour_selection_warn"),
@@ -501,7 +503,7 @@ public class UserDefinedColours extends GUserDefinedColours
         String[] options = new String[] { title,
             MessageManager.getString("label.dont_save_changes"), };
         final String question = JvSwingUtils.wrapTooltip(true, message);
-        int response = JvOptionPane.showOptionDialog(Desktop.getDesktopPane(),
+        int response = JvOptionPane.showOptionDialog(Desktop.desktop,
                 question, title, JvOptionPane.DEFAULT_OPTION,
                 JvOptionPane.PLAIN_MESSAGE, null, options, options[0]);
 
@@ -555,7 +557,7 @@ public class UserDefinedColours extends GUserDefinedColours
   {
     if (isNoSelectionMade())
     {
-      JvOptionPane.showMessageDialog(Desktop.getDesktopPane(),
+      JvOptionPane.showMessageDialog(Desktop.desktop,
               MessageManager
                       .getString("label.no_colour_selection_in_scheme"),
               MessageManager.getString("label.no_colour_selection_warn"),
@@ -692,7 +694,7 @@ public class UserDefinedColours extends GUserDefinedColours
 
   /**
    * Loads the user-defined colour scheme from the first file listed in property
-   * Preferences.USER_DEFINED_COLOURS. If this fails, returns an all-white colour scheme.
+   * "USER_DEFINED_COLOURS". If this fails, returns an all-white colour scheme.
    * 
    * @return
    */
@@ -700,7 +702,7 @@ public class UserDefinedColours extends GUserDefinedColours
   {
     UserColourScheme ret = null;
 
-    String colours = Cache.getProperty(Preferences.USER_DEFINED_COLOURS);
+    String colours = Cache.getProperty(USER_DEFINED_COLOURS);
     if (colours != null)
     {
       if (colours.indexOf("|") > -1)
@@ -739,7 +741,7 @@ public class UserDefinedColours extends GUserDefinedColours
     String name = schemeName.getText().trim();
     if (name.length() < 1)
     {
-      JvOptionPane.showInternalMessageDialog(Desktop.getDesktopPane(),
+      JvOptionPane.showInternalMessageDialog(Desktop.desktop,
               MessageManager
                       .getString("label.user_colour_scheme_must_have_name"),
               MessageManager.getString("label.no_name_colour_scheme"),
@@ -754,7 +756,7 @@ public class UserDefinedColours extends GUserDefinedColours
        * @j2sIgnore
        */
       {
-        int reply = JvOptionPane.showInternalConfirmDialog(Desktop.getDesktopPane(),
+        int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
                 MessageManager.formatMessage(
                         "label.colour_scheme_exists_overwrite", new Object[]
                         { name, name }),
@@ -812,8 +814,7 @@ public class UserDefinedColours extends GUserDefinedColours
      * update the delimited list of user defined colour files in
      * Jalview property USER_DEFINED_COLOURS
      */
-    String defaultColours = Cache.getDefault(
-            Preferences.USER_DEFINED_COLOURS,
+    String defaultColours = Cache.getDefault(USER_DEFINED_COLOURS,
             filePath);
     if (defaultColours.indexOf(filePath) == -1)
     {
@@ -823,7 +824,7 @@ public class UserDefinedColours extends GUserDefinedColours
       }
       defaultColours = defaultColours.concat(filePath);
     }
-    Cache.setProperty(Preferences.USER_DEFINED_COLOURS, defaultColours);
+    Cache.setProperty(USER_DEFINED_COLOURS, defaultColours);
 
     /*
      * construct and register the colour scheme