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 features/JAL-845splitPaneMergeDevelop
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
d7a521c
..
c5562c6
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-528,7
+528,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
}
}else{
for (int i = 0; i < 24; i++){
}
}else{
for (int i = 0; i < 24; i++){
- JButton button = (JButton) upperCaseButtons.get(i);
+ JButton button = upperCaseButtons.get(i);
newColours[i] = button.getBackground();
}
}
newColours[i] = button.getBackground();
}
}
@@
-547,7
+547,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
}
}else{
for (int i = 0; i < 23; i++){
}
}else{
for (int i = 0; i < 23; i++){
- JButton button = (JButton) lowerCaseButtons.get(i);
+ JButton button = lowerCaseButtons.get(i);
newColours[i] = button.getBackground();
}
}
newColours[i] = button.getBackground();
}
}
@@
-556,7
+556,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
if (ap != null)
{
if (ap != null)
{
- ucs.setThreshold(0, ap.av.getIgnoreGapsConsensus());
+ ucs.setThreshold(0, ap.av.isIgnoreGapsConsensus());
}
return ucs;
}
return ucs;