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-3066 Fix NullPointerException thrown when showing HMMER run dialog
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColourChooser.java
diff --git
a/src/jalview/gui/AnnotationColourChooser.java
b/src/jalview/gui/AnnotationColourChooser.java
index
b547214
..
bd05be1
100644
(file)
--- a/
src/jalview/gui/AnnotationColourChooser.java
+++ b/
src/jalview/gui/AnnotationColourChooser.java
@@
-301,14
+301,14
@@
public class AnnotationColourChooser extends AnnotationRowFilter
updateView();
}
};
updateView();
}
};
- JalviewColourChooser.showColourChooser(Desktop.getDesktop(), ttl,
+ JalviewColourChooser.showColourChooser(Desktop.getDesktopPane(), ttl,
colourPanel.getBackground(), listener);
}
@Override
public void reset()
{
colourPanel.getBackground(), listener);
}
@Override
public void reset()
{
- av.setGlobalColourScheme(oldcs);
+ this.ap.alignFrame.changeColour(oldcs);
if (av.getAlignment().getGroups() != null)
{
if (av.getAlignment().getGroups() != null)
{
@@
-433,7
+433,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
acg.setThresholdIsMinMax(thresholdIsMin.isSelected());
acg.setThresholdIsMinMax(thresholdIsMin.isSelected());
- av.setGlobalColourScheme(acg);
+ this.ap.alignFrame.changeColour(acg);
if (av.getAlignment().getGroups() != null)
{
if (av.getAlignment().getGroups() != null)
{
@@
-445,7
+445,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
continue;
}
sg.setColourScheme(
continue;
}
sg.setColourScheme(
- acg.getInstance(sg, ap.av.getHiddenRepSequences()));
+ acg.getInstance(av, sg));
}
}
}
}
}
}
@@
-456,5
+456,4
@@
public class AnnotationColourChooser extends AnnotationRowFilter
super.sliderDragReleased();
ap.paintAlignment(true, true);
}
super.sliderDragReleased();
ap.paintAlignment(true, true);
}
-
}
}