git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a02c010
)
Return white userColourScheme, not null colourscheme
author
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Aug 2005 09:31:34 +0000
(09:31 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Wed, 17 Aug 2005 09:31:34 +0000
(09:31 +0000)
src/jalview/gui/UserDefinedColours.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
0477391
..
c61db4b
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-336,7
+336,7
@@
public class UserDefinedColours extends GUserDefinedColours
*/
\r
public static UserColourScheme loadDefaultColours()
\r
{
\r
*/
\r
public static UserColourScheme loadDefaultColours()
\r
{
\r
- String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
\r
+ String colours = jalview.bin.Cache.getProperty("USER_DEFINED_COLOURS");
\r
if ( colours != null)
\r
{
\r
if(colours.indexOf("|")>-1)
\r
if ( colours != null)
\r
{
\r
if(colours.indexOf("|")>-1)
\r
@@
-346,7
+346,12
@@
public class UserDefinedColours extends GUserDefinedColours
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- return null;
\r
+ Color[] newColours = new Color[24];
\r
+ for (int i = 0; i < 24; i++)
\r
+ {
\r
+ newColours[i] = Color.white;
\r
+ }
\r
+ return new UserColourScheme(newColours);
\r
}
\r
}
\r
\r
}
\r
}
\r
\r