*/
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
{
/*
* store in an order-preserving map, so items can be added to menus
* in the order in which they are 'discovered'
*/
- schemes = new LinkedHashMap<String, ColourSchemeI>();
+ schemes = new LinkedHashMap<>();
for (JalviewColourScheme cs : JalviewColourScheme.values())
{
try
{
- registerColourScheme(cs.getSchemeClass().newInstance());
+ registerColourScheme(
+ cs.getSchemeClass().getDeclaredConstructor().newInstance());
} catch (InstantiationException | IllegalAccessException e)
{
System.err.println("Error instantiating colour scheme for "
+ cs.toString() + " " + e.getMessage());
+ e.printStackTrace();
+ } catch (ReflectiveOperationException roe)
+ {
+ roe.printStackTrace();
}
}
}
* name is lower-case for non-case-sensitive lookup
* (name in the colour keeps its true case)
*/
- String lower = name.toLowerCase();
+ 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());
+ schemes.remove(getColourSchemeShortName(name));
}
}
*
* @param name
* name of the colour scheme
+ * @param viewport
* @param forData
* the data to be coloured
* @param optional
* represent
* @return
*/
- public ColourSchemeI getColourScheme(String name,
+ public ColourSchemeI getColourScheme(String name, AlignViewportI viewport,
AnnotatedCollectionI forData,
Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
{
{
return null;
}
- ColourSchemeI cs = schemes.get(name.toLowerCase());
- return cs == null ? null : cs.getInstance(forData, hiddenRepSequences);
+ ColourSchemeI cs = schemes.get(getColourSchemeShortName(name));
+ return cs == null ? null : cs.getInstance(viewport, forData);
}
/**
public ColourSchemeI getColourScheme(String name,
AnnotatedCollectionI forData)
{
- return getColourScheme(name, forData, null);
+ return getColourScheme(name, null, forData, null);
}
/**
{
return false;
}
- return schemes.containsKey(name.toLowerCase());
+ return schemes.containsKey(getColourSchemeShortName(name));
}
}