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 'releases/Release_2_10_2b1_Branch'
[jalview.git]
/
src
/
jalview
/
schemes
/
UserColourScheme.java
diff --git
a/src/jalview/schemes/UserColourScheme.java
b/src/jalview/schemes/UserColourScheme.java
index
b86250a
..
bf62e45
100755
(executable)
--- a/
src/jalview/schemes/UserColourScheme.java
+++ b/
src/jalview/schemes/UserColourScheme.java
@@
-287,7
+287,7
@@
public class UserColourScheme extends ResidueColourScheme
/*
* step 1: build a map from colours to the symbol(s) that have the colour
*/
/*
* step 1: build a map from colours to the symbol(s) that have the colour
*/
- Map<Color, List<String>> colours = new HashMap<Color, List<String>>();
+ Map<Color, List<String>> colours = new HashMap<>();
for (char symbol = 'A'; symbol <= 'Z'; symbol++)
{
for (char symbol = 'A'; symbol <= 'Z'; symbol++)
{
@@
-320,7
+320,7
@@
public class UserColourScheme extends ResidueColourScheme
/*
* step 2: make a list of { A,G,R=12f9d6 } residues/colour specs
*/
/*
* step 2: make a list of { A,G,R=12f9d6 } residues/colour specs
*/
- List<String> residueColours = new ArrayList<String>();
+ List<String> residueColours = new ArrayList<>();
for (Entry<Color, List<String>> cols : colours.entrySet())
{
boolean first = true;
for (Entry<Color, List<String>> cols : colours.entrySet())
{
boolean first = true;
@@
-350,4
+350,10
@@
public class UserColourScheme extends ResidueColourScheme
Collections.sort(residueColours);
return StringUtils.listToDelimitedString(residueColours, ";");
}
Collections.sort(residueColours);
return StringUtils.listToDelimitedString(residueColours, ";");
}
+
+ @Override
+ public boolean hasGapColour()
+ {
+ return (findColour(' ') != null);
+ }
}
}