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-2360colourSchemeApplicability
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
012edb6
..
5314c5c
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-64,7
+64,8
@@
import javax.swing.event.ChangeListener;
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";
@@
-150,7
+151,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
if (oldColourScheme instanceof UserColourScheme)
{
if (oldColourScheme instanceof UserColourScheme)
{
- schemeName.setText(((UserColourScheme) oldColourScheme).getSchemeName());
+ schemeName.setText(((UserColourScheme) oldColourScheme)
+ .getSchemeName());
}
resetButtonPanel(false);
}
resetButtonPanel(false);
@@
-403,8
+405,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
* @param buttonIndex
* the button's position in the list
*/
* @param buttonIndex
* the button's position in the list
*/
- JButton makeButton(String label, String residue,
- List<JButton> buttons, int buttonIndex)
+ JButton makeButton(String label, String residue, List<JButton> buttons,
+ int buttonIndex)
{
final JButton button;
Color col;
{
final JButton button;
Color col;
@@
-605,8
+607,8
@@
public class UserDefinedColours extends GUserDefinedColours implements
upperCaseButtons = new ArrayList<JButton>();
lowerCaseButtons = new ArrayList<JButton>();
upperCaseButtons = new ArrayList<JButton>();
lowerCaseButtons = new ArrayList<JButton>();
- JalviewFileChooser chooser = new JalviewFileChooser(
- Cache.getProperty(LAST_DIRECTORY), "jc", "Jalview User Colours");
+ JalviewFileChooser chooser = new JalviewFileChooser("jc",
+ "Jalview User Colours");
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.load_colour_scheme"));
chooser.setFileView(new JalviewFileView());
chooser.setDialogTitle(MessageManager
.getString("label.load_colour_scheme"));
@@
-621,7
+623,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 = ColourSchemes.loadColourScheme(choice.getAbsolutePath());
+ UserColourScheme ucs = ColourSchemes.loadColourScheme(choice
+ .getAbsolutePath());
Color[] colors = ucs.getColours();
schemeName.setText(ucs.getSchemeName());
Color[] colors = ucs.getColours();
schemeName.setText(ucs.getSchemeName());
@@
-713,8
+716,7
@@
public class UserDefinedColours extends GUserDefinedColours implements
}
ColourSchemes.getInstance().removeColourScheme(name);
}
}
ColourSchemes.getInstance().removeColourScheme(name);
}
- JalviewFileChooser chooser = new JalviewFileChooser(
- Cache.getProperty(LAST_DIRECTORY), "jc",
+ JalviewFileChooser chooser = new JalviewFileChooser("jc",
"Jalview User Colours");
JalviewFileView fileView = new JalviewFileView();
"Jalview User Colours");
JalviewFileView fileView = new JalviewFileView();