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-3210 Improvements to eclipse detection. New src tree and SwingJS updated from...
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColourChooser.java
diff --git
a/src/jalview/gui/AnnotationColourChooser.java
b/src/jalview/gui/AnnotationColourChooser.java
index
e89c1c2
..
a48553e
100644
(file)
--- a/
src/jalview/gui/AnnotationColourChooser.java
+++ b/
src/jalview/gui/AnnotationColourChooser.java
@@
-283,9
+283,9
@@
public class AnnotationColourChooser extends AnnotationRowFilter
private void setDefaultMinMax()
{
minColour.setBackground(
private void setDefaultMinMax()
{
minColour.setBackground(
- Cache.getDefaultColour("ANNOTATIONCOLOUR_MIN", Color.orange));
+ Cache.getDefaultColour(Preferences.ANNOTATIONCOLOUR_MIN, Color.orange));
maxColour.setBackground(
maxColour.setBackground(
- Cache.getDefaultColour("ANNOTATIONCOLOUR_MAX", Color.red));
+ Cache.getDefaultColour(Preferences.ANNOTATIONCOLOUR_MAX, Color.red));
}
protected void showColourChooser(JPanel colourPanel, String titleKey)
}
protected void showColourChooser(JPanel colourPanel, String titleKey)
@@
-301,7
+301,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
updateView();
}
};
updateView();
}
};
- JalviewColourChooser.showColourChooser(Desktop.getDesktop(), ttl,
+ JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), ttl,
colourPanel.getBackground(), listener);
}
colourPanel.getBackground(), listener);
}