X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fschemes%2FColourSchemes.java;h=99e97592c55bb2c8f52de2a32c1f9ad908825391;hb=36067eda8f713ab855b839fd4cc9af5cf36854a4;hp=33ec966d60d2ccf7ab18084eb39aba31bd3d54f3;hpb=92bd4313e2f23a65df1eb965e836d178c1eacdd1;p=jalview.git
diff --git a/src/jalview/schemes/ColourSchemes.java b/src/jalview/schemes/ColourSchemes.java
index 33ec966..99e9759 100644
--- a/src/jalview/schemes/ColourSchemes.java
+++ b/src/jalview/schemes/ColourSchemes.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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.schemes;
import jalview.datamodel.AnnotatedCollectionI;
@@ -15,7 +35,7 @@ public class ColourSchemes
private static ColourSchemes instance = new ColourSchemes();
/*
- * a map from scheme name to an instance of it
+ * a map from scheme name (lower-cased) to an instance of it
*/
private Map schemes;
@@ -94,9 +114,12 @@ public class ColourSchemes
*/
public void removeColourScheme(String name)
{
- schemes.remove(name);
+ if (name != null)
+ {
+ schemes.remove(name.toLowerCase());
+ }
}
-
+
/**
* Returns an instance of the colour scheme with which the given view may be
* coloured
@@ -148,4 +171,20 @@ public class ColourSchemes
{
return schemes.values();
}
+
+ /**
+ * Answers true if there is a scheme with the given name, else false. The test
+ * is not case-sensitive.
+ *
+ * @param name
+ * @return
+ */
+ public boolean nameExists(String name)
+ {
+ if (name == null)
+ {
+ return false;
+ }
+ return schemes.containsKey(name.toLowerCase());
+ }
}