*/
package jalview.schemes;
+import java.util.Locale;
+
import jalview.api.AlignViewportI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
{
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 = name.toLowerCase(Locale.ROOT);
if (schemes.containsKey(lower))
{
System.err
{
if (name != null)
{
- schemes.remove(name.toLowerCase());
+ schemes.remove(name.toLowerCase(Locale.ROOT));
}
}
{
return null;
}
- ColourSchemeI cs = schemes.get(name.toLowerCase());
+ ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
return cs == null ? null
- : cs.getInstance(viewport, forData, hiddenRepSequences);
+ : cs.getInstance(viewport, forData);
}
/**
{
return false;
}
- return schemes.containsKey(name.toLowerCase());
+ return schemes.containsKey(name.toLowerCase(Locale.ROOT));
}
}