JAL-2360 refactoring for JalviewColourScheme enum,

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

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 3b6ebfa..64e0e15 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -124,7 +124,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
     if (oldColourScheme instanceof UserColourScheme)
     {
-      schemeName.setText(((UserColourScheme) oldColourScheme).getName());
+      schemeName.setText(((UserColourScheme) oldColourScheme).getSchemeName());
       if (((UserColourScheme) oldColourScheme).getLowerCaseColours() != null)
       {
         caseSensitive.setSelected(true);
@@ -156,7 +156,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
     if (oldColourScheme instanceof UserColourScheme)
     {
-      schemeName.setText(((UserColourScheme) oldColourScheme).getName());
+      schemeName.setText(((UserColourScheme) oldColourScheme).getSchemeName());
     }
 
     resetButtonPanel(false);
@@ -632,7 +632,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
 
     UserColourScheme ucs = loadColours(choice.getAbsolutePath());
     Color[] colors = ucs.getColours();
-    schemeName.setText(ucs.getName());
+    schemeName.setText(ucs.getSchemeName());
 
     if (ucs.getLowerCaseColours() != null)
     {
@@ -999,7 +999,7 @@ public class UserDefinedColours extends GUserDefinedColours implements
             coloursFound.append("|");
           }
           coloursFound.append(file);
-          userColourSchemes.put(ucs.getName(), ucs);
+          userColourSchemes.put(ucs.getSchemeName(), ucs);
         }
       } catch (Exception ex)
       {
@@ -1037,14 +1037,14 @@ public class UserDefinedColours extends GUserDefinedColours implements
       try
       {
         UserColourScheme ucs = loadColours(file);
-        if (ucs != null && !ucs.getName().equals(target))
+        if (ucs != null && !ucs.getSchemeName().equals(target))
         {
           if (coloursFound.length() > 0)
           {
             coloursFound.append("|");
           }
           coloursFound.append(file);
-          userColourSchemes.put(ucs.getName(), ucs);
+          userColourSchemes.put(ucs.getSchemeName(), ucs);
         }
       } catch (Exception ex)
       {