*/
package jalview.schemes;
+import java.util.LinkedHashMap;
import java.util.Locale;
+import java.util.Map;
import jalview.api.AlignViewportI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
import jalview.datamodel.SequenceI;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
public class ColourSchemes
{
/*
* name is lower-case for non-case-sensitive lookup
* (name in the colour keeps its true case)
*/
- String lower = name.toLowerCase(Locale.ROOT);
+ String lower = getColourSchemeShortName(cs);
if (schemes.containsKey(lower))
{
System.err
schemes.put(lower, cs);
}
+ private String getColourSchemeShortName(ColourSchemeI cs)
+ {
+ return getColourSchemeShortName(cs.getSchemeName());
+ }
+
+ private String getColourSchemeShortName(String name)
+ {
+ if (name == null)
+ return null;
+ return name.toLowerCase(Locale.ROOT).replaceAll("%", "pc")
+ .replaceAll("[^a-z0-9]", "-").replaceAll("--+", "-");
+ }
+
/**
* Removes a colour scheme by name
*
{
if (name != null)
{
- schemes.remove(name.toLowerCase(Locale.ROOT));
+ schemes.remove(getColourSchemeShortName(name));
}
}
{
return null;
}
- ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
+ ColourSchemeI cs = schemes.get(getColourSchemeShortName(name));
return cs == null ? null : cs.getInstance(viewport, forData);
}
{
return false;
}
- return schemes.containsKey(name.toLowerCase(Locale.ROOT));
+ return schemes.containsKey(getColourSchemeShortName(name));
}
}