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
/
appletgui
/
SliderPanel.java
diff --git
a/src/jalview/appletgui/SliderPanel.java
b/src/jalview/appletgui/SliderPanel.java
index
35c2a22
..
9335e2f
100644
(file)
--- a/
src/jalview/appletgui/SliderPanel.java
+++ b/
src/jalview/appletgui/SliderPanel.java
@@
-21,7
+21,7
@@
package jalview.appletgui;
import jalview.datamodel.SequenceGroup;
package jalview.appletgui;
import jalview.datamodel.SequenceGroup;
-import jalview.schemes.ColourSchemeI;
+import jalview.schemes.CollectionColourSchemeI;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
@@
-51,27
+51,29
@@
public class SliderPanel extends Panel implements ActionListener,
boolean forConservation = true;
boolean forConservation = true;
- ColourSchemeI cs;
+ CollectionColourSchemeI cs;
static Frame conservationSlider;
static Frame PIDSlider;
public static int setConservationSlider(AlignmentPanel ap,
static Frame conservationSlider;
static Frame PIDSlider;
public static int setConservationSlider(AlignmentPanel ap,
- ColourSchemeI cs, String source)
+ CollectionColourSchemeI collectionColourSchemeI, String source)
{
SliderPanel sp = null;
if (conservationSlider == null)
{
{
SliderPanel sp = null;
if (conservationSlider == null)
{
- sp = new SliderPanel(ap, cs.getConservationInc(), true, cs);
+ sp = new SliderPanel(ap,
+ collectionColourSchemeI.getConservationInc(), true,
+ collectionColourSchemeI);
conservationSlider = new Frame();
conservationSlider.add(sp);
}
else
{
sp = (SliderPanel) conservationSlider.getComponent(0);
conservationSlider = new Frame();
conservationSlider.add(sp);
}
else
{
sp = (SliderPanel) conservationSlider.getComponent(0);
- sp.cs = cs;
+ sp.cs = collectionColourSchemeI;
}
conservationSlider
}
conservationSlider
@@
-106,6
+108,7
@@
public class SliderPanel extends Panel implements ActionListener,
conservationSlider.getTitle(), 420, 100);
conservationSlider.addWindowListener(new WindowAdapter()
{
conservationSlider.getTitle(), 420, 100);
conservationSlider.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent e)
{
conservationSlider = null;
public void windowClosing(WindowEvent e)
{
conservationSlider = null;
@@
-116,20
+119,20
@@
public class SliderPanel extends Panel implements ActionListener,
}
}
- public static int setPIDSliderSource(AlignmentPanel ap, ColourSchemeI cs,
- String source)
+ public static int setPIDSliderSource(AlignmentPanel ap,
+ CollectionColourSchemeI collectionColourSchemeI, String source)
{
SliderPanel pid = null;
if (PIDSlider == null)
{
{
SliderPanel pid = null;
if (PIDSlider == null)
{
- pid = new SliderPanel(ap, 50, false, cs);
+ pid = new SliderPanel(ap, 50, false, collectionColourSchemeI);
PIDSlider = new Frame();
PIDSlider.add(pid);
}
else
{
pid = (SliderPanel) PIDSlider.getComponent(0);
PIDSlider = new Frame();
PIDSlider.add(pid);
}
else
{
pid = (SliderPanel) PIDSlider.getComponent(0);
- pid.cs = cs;
+ pid.cs = collectionColourSchemeI;
}
PIDSlider
.setTitle(MessageManager.formatMessage(
}
PIDSlider
.setTitle(MessageManager.formatMessage(
@@
-165,6
+168,7
@@
public class SliderPanel extends Panel implements ActionListener,
420, 100);
PIDSlider.addWindowListener(new WindowAdapter()
{
420, 100);
PIDSlider.addWindowListener(new WindowAdapter()
{
+ @Override
public void windowClosing(WindowEvent e)
{
PIDSlider = null;
public void windowClosing(WindowEvent e)
{
PIDSlider = null;
@@
-175,7
+179,7
@@
public class SliderPanel extends Panel implements ActionListener,
}
public SliderPanel(AlignmentPanel ap, int value, boolean forConserve,
}
public SliderPanel(AlignmentPanel ap, int value, boolean forConserve,
- ColourSchemeI cs)
+ CollectionColourSchemeI collectionColourSchemeI)
{
try
{
{
try
{
@@
-185,7
+189,7
@@
public class SliderPanel extends Panel implements ActionListener,
e.printStackTrace();
}
this.ap = ap;
e.printStackTrace();
}
this.ap = ap;
- this.cs = cs;
+ this.cs = collectionColourSchemeI;
forConservation = forConserve;
undoButton.setVisible(false);
applyButton.setVisible(false);
forConservation = forConserve;
undoButton.setVisible(false);
applyButton.setVisible(false);
@@
-220,7
+224,7
@@
public class SliderPanel extends Panel implements ActionListener,
return;
}
return;
}
- ColourSchemeI toChange = cs;
+ CollectionColourSchemeI toChange = cs;
Iterator<SequenceGroup> allGroups = null;
if (allGroupsCheck.getState())
Iterator<SequenceGroup> allGroups = null;
if (allGroupsCheck.getState())
@@
-261,6
+265,7
@@
public class SliderPanel extends Panel implements ActionListener,
allGroupsCheck.setEnabled(b);
}
allGroupsCheck.setEnabled(b);
}
+ @Override
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == applyButton)
public void actionPerformed(ActionEvent evt)
{
if (evt.getSource() == applyButton)
@@
-277,6
+282,7
@@
public class SliderPanel extends Panel implements ActionListener,
}
}
}
}
+ @Override
public void adjustmentValueChanged(AdjustmentEvent evt)
{
valueField.setText(slider.getValue() + "");
public void adjustmentValueChanged(AdjustmentEvent evt)
{
valueField.setText(slider.getValue() + "");
@@
-381,23
+387,28
@@
public class SliderPanel extends Panel implements ActionListener,
{
}
{
}
+ @Override
public void mousePressed(MouseEvent evt)
{
}
public void mousePressed(MouseEvent evt)
{
}
+ @Override
public void mouseReleased(MouseEvent evt)
{
ap.paintAlignment(true);
}
public void mouseReleased(MouseEvent evt)
{
ap.paintAlignment(true);
}
+ @Override
public void mouseClicked(MouseEvent evt)
{
}
public void mouseClicked(MouseEvent evt)
{
}
+ @Override
public void mouseEntered(MouseEvent evt)
{
}
public void mouseEntered(MouseEvent evt)
{
}
+ @Override
public void mouseExited(MouseEvent evt)
{
}
public void mouseExited(MouseEvent evt)
{
}