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:
5e84394
)
catch null pointer exception when no colourscheme is active
author
jprocter
<Jim Procter>
Fri, 19 Dec 2008 15:36:30 +0000
(15:36 +0000)
committer
jprocter
<Jim Procter>
Fri, 19 Dec 2008 15:36:30 +0000
(15:36 +0000)
src/jalview/gui/UserDefinedColours.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/UserDefinedColours.java
b/src/jalview/gui/UserDefinedColours.java
index
ca1ebf4
..
83f9d0c
100755
(executable)
--- a/
src/jalview/gui/UserDefinedColours.java
+++ b/
src/jalview/gui/UserDefinedColours.java
@@
-373,12
+373,14
@@
public class UserDefinedColours extends GUserDefinedColours implements
caseSensitiveButtons.addElement(button);
col = Color.white;
caseSensitiveButtons.addElement(button);
col = Color.white;
-
- try
- {
- col = oldColourScheme.findColour(aa.charAt(0), -1);
- } catch (Exception ex)
+ if (oldColourScheme!=null)
{
{
+ try
+ {
+ col = oldColourScheme.findColour(aa.charAt(0), -1);
+ } catch (Exception ex)
+ {
+ }
}
}
}
}