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-3011 - show score in annotation row - looks like this got lost in an automerge
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
f75a0a3
..
3290500
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-59,11
+59,11
@@
import javax.swing.event.ChangeListener;
* @author Andrew Waterhouse
* @author Mungo Carstairs
*/
* @author Andrew Waterhouse
* @author Mungo Carstairs
*/
-public class UserDefinedColours extends GUserDefinedColours implements
- ChangeListener
+public class UserDefinedColours extends GUserDefinedColours
+ implements ChangeListener
{
{
- private static final Font VERDANA_BOLD_10 = new Font("Verdana",
- Font.BOLD, 10);
+ private static final Font VERDANA_BOLD_10 = new Font("Verdana", Font.BOLD,
+ 10);
public static final String USER_DEFINED_COLOURS = "USER_DEFINED_COLOURS";
public static final String USER_DEFINED_COLOURS = "USER_DEFINED_COLOURS";
@@
-113,7
+113,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
if (oldColourScheme instanceof UserColourScheme)
{
schemeName.setText(oldColourScheme.getSchemeName());
if (oldColourScheme instanceof UserColourScheme)
{
schemeName.setText(oldColourScheme.getSchemeName());
- if (((UserColourScheme) oldColourScheme).getLowerCaseColours() != null)
+ if (((UserColourScheme) oldColourScheme)
+ .getLowerCaseColours() != null)
{
caseSensitive.setSelected(true);
lcaseColour.setEnabled(true);
{
caseSensitive.setSelected(true);
lcaseColour.setEnabled(true);
@@
-135,7
+136,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
UserDefinedColours()
{
super();
UserDefinedColours()
{
super();
- selectedButtons = new ArrayList<JButton>();
+ selectedButtons = new ArrayList<>();
}
void showFrame()
}
void showFrame()
@@
-162,7
+163,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
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++)
@@
-193,7
+194,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
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++)
@@
-249,7
+250,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
button = lowerCaseButtons.get(i);
button.setBackground(newColour);
{
button = lowerCaseButtons.get(i);
button.setBackground(newColour);
- button.setForeground(ColorUtils.brighterThan(button.getBackground()));
+ button.setForeground(
+ ColorUtils.brighterThan(button.getBackground()));
}
}
for (int i = 0; i < selectedButtons.size(); i++)
}
}
for (int i = 0; i < selectedButtons.size(); i++)
@@
-321,8
+323,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
JButton button = (JButton) buttonPanel.getComponent(b);
if (!selectedButtons.contains(button))
{
JButton button = (JButton) buttonPanel.getComponent(b);
if (!selectedButtons.contains(button))
{
- button.setForeground(ColorUtils.brighterThan(button
- .getBackground()));
+ button.setForeground(
+ ColorUtils.brighterThan(button.getBackground()));
selectedButtons.add(button);
}
}
selectedButtons.add(button);
}
}
@@
-335,7
+337,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
button.setForeground(ColorUtils.darkerThan(button.getBackground()));
}
selectedButtons.clear();
button.setForeground(ColorUtils.darkerThan(button.getBackground()));
}
selectedButtons.clear();
- pressed.setForeground(ColorUtils.brighterThan(pressed.getBackground()));
+ pressed.setForeground(
+ ColorUtils.brighterThan(pressed.getBackground()));
selectedButtons.add(pressed);
}
selectedButtons.add(pressed);
}
@@
-343,13
+346,14
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
if (selectedButtons.contains(pressed))
{
{
if (selectedButtons.contains(pressed))
{
- pressed.setForeground(ColorUtils.darkerThan(pressed.getBackground()));
+ pressed.setForeground(
+ ColorUtils.darkerThan(pressed.getBackground()));
selectedButtons.remove(pressed);
}
else
{
selectedButtons.remove(pressed);
}
else
{
- pressed.setForeground(ColorUtils.brighterThan(pressed
- .getBackground()));
+ pressed.setForeground(
+ ColorUtils.brighterThan(pressed.getBackground()));
selectedButtons.add(pressed);
}
}
selectedButtons.add(pressed);
}
}
@@
-440,8
+444,9
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
if (isNoSelectionMade())
{
{
if (isNoSelectionMade())
{
- JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
- .getString("label.no_colour_selection_in_scheme"),
+ JvOptionPane.showMessageDialog(Desktop.desktop,
+ MessageManager
+ .getString("label.no_colour_selection_in_scheme"),
MessageManager.getString("label.no_colour_selection_warn"),
JvOptionPane.WARNING_MESSAGE);
}
MessageManager.getString("label.no_colour_selection_warn"),
JvOptionPane.WARNING_MESSAGE);
}
@@
-543,8
+548,9
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
if (isNoSelectionMade())
{
{
if (isNoSelectionMade())
{
- JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager
- .getString("label.no_colour_selection_in_scheme"),
+ JvOptionPane.showMessageDialog(Desktop.desktop,
+ MessageManager
+ .getString("label.no_colour_selection_in_scheme"),
MessageManager.getString("label.no_colour_selection_warn"),
JvOptionPane.WARNING_MESSAGE);
MessageManager.getString("label.no_colour_selection_warn"),
JvOptionPane.WARNING_MESSAGE);
@@
-625,14
+631,14
@@
public class UserDefinedColours extends GUserDefinedColours implements
@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");
chooser.setFileView(new JalviewFileView());
JalviewFileChooser chooser = new JalviewFileChooser("jc",
"Jalview User Colours");
chooser.setFileView(new JalviewFileView());
- chooser.setDialogTitle(MessageManager
- .getString("label.load_colour_scheme"));
+ chooser.setDialogTitle(
+ MessageManager.getString("label.load_colour_scheme"));
chooser.setToolTipText(MessageManager.getString("action.load"));
int value = chooser.showOpenDialog(this);
chooser.setToolTipText(MessageManager.getString("action.load"));
int value = chooser.showOpenDialog(this);
@@
-644,8
+650,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
File choice = chooser.getSelectedFile();
Cache.setProperty(LAST_DIRECTORY, choice.getParent());
File choice = chooser.getSelectedFile();
Cache.setProperty(LAST_DIRECTORY, choice.getParent());
- UserColourScheme ucs = ColourSchemeLoader.loadColourScheme(choice
- .getAbsolutePath());
+ UserColourScheme ucs = ColourSchemeLoader
+ .loadColourScheme(choice.getAbsolutePath());
Color[] colors = ucs.getColours();
schemeName.setText(ucs.getSchemeName());
Color[] colors = ucs.getColours();
schemeName.setText(ucs.getSchemeName());
@@
-712,7
+718,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
* name if overwriting</li>
* <li>Do the standard file chooser thing to write with extension .jc</li>
* <li>If saving changes (possibly not yet applied) to the currently selected
* name if overwriting</li>
* <li>Do the standard file chooser thing to write with extension .jc</li>
* <li>If saving changes (possibly not yet applied) to the currently selected
- * colour scheme, then apply the changes, as it is too late to back out now</li>
+ * colour scheme, then apply the changes, as it is too late to back out
+ * now</li>
* <li>Don't apply the changes if the currently selected scheme is different,
* to allow a new scheme to be configured and saved but not applied</li>
* </ul>
* <li>Don't apply the changes if the currently selected scheme is different,
* to allow a new scheme to be configured and saved but not applied</li>
* </ul>
@@
-726,8
+733,9
@@
public class UserDefinedColours extends GUserDefinedColours implements
String name = schemeName.getText().trim();
if (name.length() < 1)
{
String name = schemeName.getText().trim();
if (name.length() < 1)
{
- JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager
- .getString("label.user_colour_scheme_must_have_name"),
+ JvOptionPane.showInternalMessageDialog(Desktop.desktop,
+ MessageManager
+ .getString("label.user_colour_scheme_must_have_name"),
MessageManager.getString("label.no_name_colour_scheme"),
JvOptionPane.WARNING_MESSAGE);
return false;
MessageManager.getString("label.no_name_colour_scheme"),
JvOptionPane.WARNING_MESSAGE);
return false;
@@
-737,8
+745,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
{
int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
MessageManager.formatMessage(
{
int reply = JvOptionPane.showInternalConfirmDialog(Desktop.desktop,
MessageManager.formatMessage(
- "label.colour_scheme_exists_overwrite", new Object[] {
- name, name }),
+ "label.colour_scheme_exists_overwrite", new Object[]
+ { name, name }),
MessageManager.getString("label.duplicate_scheme_name"),
JvOptionPane.YES_NO_OPTION);
if (reply != JvOptionPane.YES_OPTION)
MessageManager.getString("label.duplicate_scheme_name"),
JvOptionPane.YES_NO_OPTION);
if (reply != JvOptionPane.YES_OPTION)
@@
-751,8
+759,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
JalviewFileView fileView = new JalviewFileView();
chooser.setFileView(fileView);
JalviewFileView fileView = new JalviewFileView();
chooser.setFileView(fileView);
- chooser.setDialogTitle(MessageManager
- .getString("label.save_colour_scheme"));
+ chooser.setDialogTitle(
+ MessageManager.getString("label.save_colour_scheme"));
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
chooser.setToolTipText(MessageManager.getString("action.save"));
int value = chooser.showSaveDialog(this);
@@
-796,8
+804,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
* update the delimited list of user defined colour files in
* Jalview property USER_DEFINED_COLOURS
*/
* update the delimited list of user defined colour files in
* Jalview property USER_DEFINED_COLOURS
*/
- String defaultColours = Cache
- .getDefault(USER_DEFINED_COLOURS, filePath);
+ String defaultColours = Cache.getDefault(USER_DEFINED_COLOURS,
+ filePath);
if (defaultColours.indexOf(filePath) == -1)
{
if (defaultColours.length() > 0)
if (defaultColours.indexOf(filePath) == -1)
{
if (defaultColours.length() > 0)
@@
-868,7
+876,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
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
{