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-1988 JAL-3772 linked undostack to saved changes flags. No confirmation if all...
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemes.java
diff --git
a/src/jalview/schemes/ColourSchemes.java
b/src/jalview/schemes/ColourSchemes.java
index
42465f2
..
14daed6
100644
(file)
--- a/
src/jalview/schemes/ColourSchemes.java
+++ b/
src/jalview/schemes/ColourSchemes.java
@@
-20,6
+20,8
@@
*/
package jalview.schemes;
*/
package jalview.schemes;
+import java.util.Locale;
+
import jalview.api.AlignViewportI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
import jalview.api.AlignViewportI;
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceCollectionI;
@@
-72,12
+74,16
@@
public class ColourSchemes
{
try
{
{
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 (InstantiationException | IllegalAccessException e)
{
System.err.println("Error instantiating colour scheme for "
+ cs.toString() + " " + e.getMessage());
e.printStackTrace();
+ } catch (ReflectiveOperationException roe)
+ {
+ roe.printStackTrace();
}
}
}
}
}
}
@@
-100,7
+106,7
@@
public class ColourSchemes
* name is lower-case for non-case-sensitive lookup
* (name in the colour keeps its true case)
*/
* 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 (schemes.containsKey(lower))
{
System.err
@@
-118,7
+124,7
@@
public class ColourSchemes
{
if (name != null)
{
{
if (name != null)
{
- schemes.remove(name.toLowerCase());
+ schemes.remove(name.toLowerCase(Locale.ROOT));
}
}
}
}
@@
-136,17
+142,16
@@
public class ColourSchemes
* represent
* @return
*/
* represent
* @return
*/
- public ColourSchemeI getColourScheme(String name,
- AlignViewportI viewport, AnnotatedCollectionI forData,
+ public ColourSchemeI getColourScheme(String name, AlignViewportI viewport,
+ AnnotatedCollectionI forData,
Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
{
if (name == null)
{
return null;
}
Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
{
if (name == null)
{
return null;
}
- ColourSchemeI cs = schemes.get(name.toLowerCase());
- return cs == null ? null
- : cs.getInstance(viewport, forData);
+ ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
+ return cs == null ? null : cs.getInstance(viewport, forData);
}
/**
}
/**
@@
-189,6
+194,6
@@
public class ColourSchemes
{
return false;
}
{
return false;
}
- return schemes.containsKey(name.toLowerCase());
+ return schemes.containsKey(name.toLowerCase(Locale.ROOT));
}
}
}
}