git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-2520 improvement to download and update structure files loaded via URL to a local...
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemes.java
diff --git
a/src/jalview/schemes/ColourSchemes.java
b/src/jalview/schemes/ColourSchemes.java
index
dc7e403
..
269811b
100644
(file)
--- a/
src/jalview/schemes/ColourSchemes.java
+++ b/
src/jalview/schemes/ColourSchemes.java
@@
-15,7
+15,7
@@
public class ColourSchemes
private static ColourSchemes instance = new 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<String, ColourSchemeI> schemes;
*/
private Map<String, ColourSchemeI> schemes;
@@
-94,7
+94,10
@@
public class ColourSchemes
*/
public void removeColourScheme(String name)
{
*/
public void removeColourScheme(String name)
{
- schemes.remove(name);
+ if (name != null)
+ {
+ schemes.remove(name.toLowerCase());
+ }
}
/**
}
/**
@@
-162,14
+165,6
@@
public class ColourSchemes
{
return false;
}
{
return false;
}
- name = name.toLowerCase();
- for (ColourSchemeI scheme : getColourSchemes())
- {
- if (name.equals(scheme.getSchemeName().toLowerCase()))
- {
- return true;
- }
- }
- return false;
+ return schemes.containsKey(name.toLowerCase());
}
}
}
}