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 'features/JAL-4071_visibleFeaturesCounter' into features/JAL-3417_sdppre...
[jalview.git]
/
src
/
jalview
/
schemes
/
ColourSchemes.java
diff --git
a/src/jalview/schemes/ColourSchemes.java
b/src/jalview/schemes/ColourSchemes.java
index
faada0e
..
14daed6
100644
(file)
--- a/
src/jalview/schemes/ColourSchemes.java
+++ b/
src/jalview/schemes/ColourSchemes.java
@@
-142,8
+142,8
@@
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)
Map<SequenceI, SequenceCollectionI> hiddenRepSequences)
{
if (name == null)
@@
-151,8
+151,7
@@
public class ColourSchemes
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);
}
/**
}
/**