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-3253-applet JAL-3439 Preferences issues 1/2
[jalview.git]
/
src
/
jalview
/
gui
/
UserDefinedColours.java
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
2f18f43
..
6e3a68b
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-69,8
+69,6
@@
public class UserDefinedColours extends GUserDefinedColours
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";
-
private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
private static final int MY_FRAME_HEIGHT = 440;
private static final String LAST_DIRECTORY = "LAST_DIRECTORY";
private static final int MY_FRAME_HEIGHT = 440;
@@
-694,7
+692,7
@@
public class UserDefinedColours extends GUserDefinedColours
/**
* Loads the user-defined colour scheme from the first file listed in property
/**
* Loads the user-defined colour scheme from the first file listed in property
- * "USER_DEFINED_COLOURS". If this fails, returns an all-white colour scheme.
+ * Preferences.USER_DEFINED_COLOURS. If this fails, returns an all-white colour scheme.
*
* @return
*/
*
* @return
*/
@@
-702,7
+700,7
@@
public class UserDefinedColours extends GUserDefinedColours
{
UserColourScheme ret = null;
{
UserColourScheme ret = null;
- String colours = Cache.getProperty(USER_DEFINED_COLOURS);
+ String colours = Cache.getProperty(Preferences.USER_DEFINED_COLOURS);
if (colours != null)
{
if (colours.indexOf("|") > -1)
if (colours != null)
{
if (colours.indexOf("|") > -1)
@@
-814,7
+812,8
@@
public class UserDefinedColours extends GUserDefinedColours
* 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,
+ String defaultColours = Cache.getDefault(
+ Preferences.USER_DEFINED_COLOURS,
filePath);
if (defaultColours.indexOf(filePath) == -1)
{
filePath);
if (defaultColours.indexOf(filePath) == -1)
{
@@
-824,7
+823,7
@@
public class UserDefinedColours extends GUserDefinedColours
}
defaultColours = defaultColours.concat(filePath);
}
}
defaultColours = defaultColours.concat(filePath);
}
- Cache.setProperty(USER_DEFINED_COLOURS, defaultColours);
+ Cache.setProperty(Preferences.USER_DEFINED_COLOURS, defaultColours);
/*
* construct and register the colour scheme
/*
* construct and register the colour scheme