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
Merge branch 'develop' into task/JAL-2196pdbeProperties
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationRowFilter.java
diff --git
a/src/jalview/gui/AnnotationRowFilter.java
b/src/jalview/gui/AnnotationRowFilter.java
index
0a5e96c
..
c8bd69c
100644
(file)
--- a/
src/jalview/gui/AnnotationRowFilter.java
+++ b/
src/jalview/gui/AnnotationRowFilter.java
@@
-26,7
+26,6
@@
import jalview.datamodel.SequenceGroup;
import jalview.schemes.AnnotationColourGradient;
import jalview.util.MessageManager;
import jalview.schemes.AnnotationColourGradient;
import jalview.util.MessageManager;
-import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Vector;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.Vector;
@@
-52,7
+51,7
@@
public abstract class AnnotationRowFilter extends JPanel
protected boolean enableSeqAss = false;
protected boolean enableSeqAss = false;
- private jalview.datamodel.AlignmentAnnotation currentAnnotation;
+ private AlignmentAnnotation currentAnnotation;
protected boolean adjusting = false;
protected boolean adjusting = false;
@@
-175,7
+174,6
@@
public abstract class AnnotationRowFilter extends JPanel
{
anmap[list.size()] = i;
list.add(label);
{
anmap[list.size()] = i;
list.add(label);
-
}
else
{
}
else
{
@@
-210,7
+208,7
@@
public abstract class AnnotationRowFilter extends JPanel
seqAssociated.setEnabled(enableSeqAss);
}
seqAssociated.setEnabled(enableSeqAss);
}
- public void ok_actionPerformed(ActionEvent e)
+ public void ok_actionPerformed()
{
try
{
{
try
{
@@
-220,7
+218,7
@@
public abstract class AnnotationRowFilter extends JPanel
}
}
}
}
- public void cancel_actionPerformed(ActionEvent e)
+ public void cancel_actionPerformed()
{
reset();
ap.paintAlignment(true);
{
reset();
ap.paintAlignment(true);
@@
-232,22
+230,22
@@
public abstract class AnnotationRowFilter extends JPanel
}
}
}
}
- public void thresholdCheck_actionPerformed(ActionEvent e)
+ public void thresholdCheck_actionPerformed()
{
updateView();
}
{
updateView();
}
- public void annotations_actionPerformed(ActionEvent e)
+ public void annotations_actionPerformed()
{
updateView();
}
{
updateView();
}
- public void threshold_actionPerformed(ActionEvent e)
+ public void threshold_actionPerformed()
{
updateView();
}
{
updateView();
}
- public void thresholdValue_actionPerformed(ActionEvent e)
+ public void thresholdValue_actionPerformed()
{
try
{
{
try
{
@@
-259,7
+257,7
@@
public abstract class AnnotationRowFilter extends JPanel
}
}
}
}
- public void thresholdIsMin_actionPerformed(ActionEvent actionEvent)
+ public void thresholdIsMin_actionPerformed()
{
updateView();
}
{
updateView();
}
@@
-274,8
+272,7
@@
public abstract class AnnotationRowFilter extends JPanel
.getString("label.threshold_feature_below_threshold"));
}
.getString("label.threshold_feature_below_threshold"));
}
- protected void seqAssociated_actionPerformed(ActionEvent arg0,
- JComboBox<String> annotations, JCheckBox seqAssociated)
+ protected void seqAssociated_actionPerformed(JComboBox<String> annotations)
{
adjusting = true;
String cursel = (String) annotations.getSelectedItem();
{
adjusting = true;
String cursel = (String) annotations.getSelectedItem();
@@
-332,26
+329,25
@@
public abstract class AnnotationRowFilter extends JPanel
}
}
}
}
- protected boolean colorAlignmContaining(
- AlignmentAnnotation currentAnnotation, int selectedThresholdItem)
+ protected boolean colorAlignmContaining(AlignmentAnnotation currentAnn,
+ int selectedThresholdOption)
{
AnnotationColourGradient acg = null;
if (currentColours.isSelected())
{
{
AnnotationColourGradient acg = null;
if (currentColours.isSelected())
{
- acg = new AnnotationColourGradient(currentAnnotation,
- av.getGlobalColourScheme(), selectedThresholdItem);
+ acg = new AnnotationColourGradient(currentAnn,
+ av.getGlobalColourScheme(), selectedThresholdOption);
}
else
{
}
else
{
- acg = new AnnotationColourGradient(currentAnnotation,
+ acg = new AnnotationColourGradient(currentAnn,
minColour.getBackground(), maxColour.getBackground(),
minColour.getBackground(), maxColour.getBackground(),
- selectedThresholdItem);
+ selectedThresholdOption);
}
acg.setSeqAssociated(seqAssociated.isSelected());
}
acg.setSeqAssociated(seqAssociated.isSelected());
- if (currentAnnotation.graphMin == 0f
- && currentAnnotation.graphMax == 0f)
+ if (currentAnn.graphMin == 0f && currentAnn.graphMax == 0f)
{
acg.setPredefinedColours(true);
}
{
acg.setPredefinedColours(true);
}
@@
-372,17
+368,17
@@
public abstract class AnnotationRowFilter extends JPanel
if (currentColours.isSelected())
{
if (currentColours.isSelected())
{
- sg.cs = new AnnotationColourGradient(currentAnnotation, sg.cs,
- selectedThresholdItem);
+ sg.cs = new AnnotationColourGradient(currentAnn, sg.cs,
+ selectedThresholdOption);
((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated
.isSelected());
}
else
{
((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated
.isSelected());
}
else
{
- sg.cs = new AnnotationColourGradient(currentAnnotation,
+ sg.cs = new AnnotationColourGradient(currentAnn,
minColour.getBackground(), maxColour.getBackground(),
minColour.getBackground(), maxColour.getBackground(),
- selectedThresholdItem);
+ selectedThresholdOption);
((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated
.isSelected());
}
((AnnotationColourGradient) sg.cs).setSeqAssociated(seqAssociated
.isSelected());
}