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-2668 fix broken factory method for colour scheme
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
8b45c40
..
3290500
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-136,7
+136,7
@@
public class UserDefinedColours extends GUserDefinedColours
UserDefinedColours()
{
super();
UserDefinedColours()
{
super();
- selectedButtons = new ArrayList<JButton>();
+ selectedButtons = new ArrayList<>();
}
void showFrame()
}
void showFrame()
@@
-163,7
+163,7
@@
public class UserDefinedColours extends GUserDefinedColours
if (upperCaseButtons == null)
{
if (upperCaseButtons == null)
{
- upperCaseButtons = new ArrayList<JButton>();
+ upperCaseButtons = new ArrayList<>();
}
for (int i = 0; i < 20; i++)
}
for (int i = 0; i < 20; i++)
@@
-194,7
+194,7
@@
public class UserDefinedColours extends GUserDefinedColours
if (lowerCaseButtons == null)
{
if (lowerCaseButtons == null)
{
- lowerCaseButtons = new ArrayList<JButton>();
+ lowerCaseButtons = new ArrayList<>();
}
for (int i = 0; i < 20; i++)
}
for (int i = 0; i < 20; i++)
@@
-631,8
+631,8
@@
public class UserDefinedColours extends GUserDefinedColours
@Override
protected void loadbutton_actionPerformed()
{
@Override
protected void loadbutton_actionPerformed()
{
- upperCaseButtons = new ArrayList<JButton>();
- lowerCaseButtons = new ArrayList<JButton>();
+ upperCaseButtons = new ArrayList<>();
+ lowerCaseButtons = new ArrayList<>();
JalviewFileChooser chooser = new JalviewFileChooser("jc",
"Jalview User Colours");
JalviewFileChooser chooser = new JalviewFileChooser("jc",
"Jalview User Colours");
@@
-876,7
+876,7
@@
public class UserDefinedColours extends GUserDefinedColours
protected void cancelButton_actionPerformed()
{
ap.alignFrame.changeColour(oldColourScheme);
protected void cancelButton_actionPerformed()
{
ap.alignFrame.changeColour(oldColourScheme);
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
try
{
try
{