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:
a50dc1e
)
Colour may have been updated in another view
author
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 15:28:45 +0000
(15:28 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 15:28:45 +0000
(15:28 +0000)
src/jalview/gui/FeatureSettings.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/FeatureSettings.java
b/src/jalview/gui/FeatureSettings.java
index
2405808
..
7acd374
100755
(executable)
--- a/
src/jalview/gui/FeatureSettings.java
+++ b/
src/jalview/gui/FeatureSettings.java
@@
-294,6
+294,13
@@
public class FeatureSettings extends JPanel
data[dataIndex][0] = type;
\r
\r
data[dataIndex][1] = fr.getColour(type);
\r
data[dataIndex][0] = type;
\r
\r
data[dataIndex][1] = fr.getColour(type);
\r
+ if (data[dataIndex][1] == null)
\r
+ {
\r
+ //"Colour has been updated in another view!!"
\r
+ fr.renderOrder = null;
\r
+ return;
\r
+ }
\r
+
\r
data[dataIndex][2] = new Boolean(true);
\r
dataIndex++;
\r
}
\r
data[dataIndex][2] = new Boolean(true);
\r
dataIndex++;
\r
}
\r