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
Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemes.java
diff --git
a/src/jalview/schemes/ColourSchemes.java
b/src/jalview/schemes/ColourSchemes.java
index
2a7bd5f
..
18f24fb
100644
(file)
--- a/
src/jalview/schemes/ColourSchemes.java
+++ b/
src/jalview/schemes/ColourSchemes.java
@@
-183,8
+183,8
@@
public class ColourSchemes implements ApplicationSingletonI
* 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)
Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
{
if (name == null)
@@
-192,8
+192,7
@@
public class ColourSchemes implements ApplicationSingletonI
return null;
}
ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
return null;
}
ColourSchemeI cs = schemes.get(name.toLowerCase(Locale.ROOT));
- return cs == null ? null
- : cs.getInstance(viewport, forData);
+ return cs == null ? null : cs.getInstance(viewport, forData);
}
/**
}
/**