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-2371 CollectionColourScheme wraps ColourSchemeI
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColourChooser.java
diff --git
a/src/jalview/gui/AnnotationColourChooser.java
b/src/jalview/gui/AnnotationColourChooser.java
index
19eed27
..
f6352d7
100644
(file)
--- a/
src/jalview/gui/AnnotationColourChooser.java
+++ b/
src/jalview/gui/AnnotationColourChooser.java
@@
-80,9
+80,9
@@
public class AnnotationColourChooser extends AnnotationRowFilter
oldgroupColours = new Hashtable<SequenceGroup, ColourSchemeI>();
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
{
oldgroupColours = new Hashtable<SequenceGroup, ColourSchemeI>();
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
{
- if (sg.cs != null)
+ if (sg.getColourScheme() != null)
{
{
- oldgroupColours.put(sg, sg.cs);
+ oldgroupColours.put(sg, sg.getColourScheme());
}
}
}
}
}
}
@@
-141,7
+141,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
default:
throw new Error(
MessageManager
default:
throw new Error(
MessageManager
- .getString("error.implementation_error_dont_know_about_thereshold_setting"));
+ .getString("error.implementation_error_dont_know_about_threshold_setting"));
}
thresholdIsMin.setSelected(acg.thresholdIsMinMax);
thresholdValue.setText("" + acg.getAnnotationThreshold());
}
thresholdIsMin.setSelected(acg.thresholdIsMinMax);
thresholdValue.setText("" + acg.getAnnotationThreshold());
@@
-210,7
+210,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- ok_actionPerformed(e);
+ ok_actionPerformed();
}
});
cancel.setOpaque(false);
}
});
cancel.setOpaque(false);
@@
-220,7
+220,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- cancel_actionPerformed(e);
+ cancel_actionPerformed();
}
});
defColours.setOpaque(false);
}
});
defColours.setOpaque(false);
@@
-233,7
+233,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent arg0)
{
@Override
public void actionPerformed(ActionEvent arg0)
{
- resetColours_actionPerformed(arg0);
+ resetColours_actionPerformed();
}
});
}
});
@@
-242,7
+242,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- annotations_actionPerformed(e);
+ annotations_actionPerformed();
}
});
getThreshold().addActionListener(new ActionListener()
}
});
getThreshold().addActionListener(new ActionListener()
@@
-250,7
+250,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- threshold_actionPerformed(e);
+ threshold_actionPerformed();
}
});
thresholdValue.addActionListener(new ActionListener()
}
});
thresholdValue.addActionListener(new ActionListener()
@@
-258,7
+258,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- thresholdValue_actionPerformed(e);
+ thresholdValue_actionPerformed();
}
});
slider.setPaintLabels(false);
}
});
slider.setPaintLabels(false);
@@
-278,7
+278,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- currentColours_actionPerformed(e);
+ currentColours_actionPerformed();
}
});
thresholdIsMin.setBackground(Color.white);
}
});
thresholdIsMin.setBackground(Color.white);
@@
-290,7
+290,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- thresholdIsMin_actionPerformed(actionEvent);
+ thresholdIsMin_actionPerformed();
}
});
seqAssociated.setBackground(Color.white);
}
});
seqAssociated.setBackground(Color.white);
@@
-303,7
+303,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
@Override
public void actionPerformed(ActionEvent arg0)
{
@Override
public void actionPerformed(ActionEvent arg0)
{
- seqAssociated_actionPerformed(arg0, annotations, seqAssociated);
+ seqAssociated_actionPerformed(annotations);
}
});
}
});
@@
-332,7
+332,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
this.validate();
}
this.validate();
}
- protected void resetColours_actionPerformed(ActionEvent arg0)
+ protected void resetColours_actionPerformed()
{
setDefaultMinMax();
updateView();
{
setDefaultMinMax();
updateView();
@@
-372,6
+372,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
updateView();
}
updateView();
}
+ @Override
public void reset()
{
av.setGlobalColourScheme(oldcs);
public void reset()
{
av.setGlobalColourScheme(oldcs);
@@
-380,11
+381,12
@@
public class AnnotationColourChooser extends AnnotationRowFilter
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
{
for (SequenceGroup sg : ap.av.getAlignment().getGroups())
{
- sg.cs = oldgroupColours.get(sg);
+ sg.setColourScheme(oldgroupColours.get(sg));
}
}
}
}
}
}
+ @Override
public void valueChanged(boolean updateAllAnnotation)
{
if (slider.isEnabled())
public void valueChanged(boolean updateAllAnnotation)
{
if (slider.isEnabled())
@@
-411,7
+413,7
@@
public class AnnotationColourChooser extends AnnotationRowFilter
this.threshold = threshold;
}
this.threshold = threshold;
}
- public void currentColours_actionPerformed(ActionEvent e)
+ public void currentColours_actionPerformed()
{
if (currentColours.isSelected())
{
{
if (currentColours.isSelected())
{