Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...

[jalview.git] / src / jalview / appletgui / SliderPanel.java

diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
index 2aa010f..1beb82b 100644 (file)
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -60,22 +60,21 @@ public class SliderPanel extends Panel implements ActionListener,
   static Frame PIDSlider;
 
   public static int setConservationSlider(AlignmentPanel ap,
-          CollectionColourSchemeI collectionColourSchemeI, String source)
+          CollectionColourSchemeI ccs, String source)
   {
     SliderPanel sp = null;
 
     if (conservationSlider == null)
     {
-      sp = new SliderPanel(ap,
-              collectionColourSchemeI.getConservationInc(), true,
-              collectionColourSchemeI);
+      sp = new SliderPanel(ap, ccs.getConservationInc(), true, ccs);
       conservationSlider = new Frame();
       conservationSlider.add(sp);
     }
     else
     {
       sp = (SliderPanel) conservationSlider.getComponent(0);
-      sp.cs = collectionColourSchemeI;
+      sp.cs = ccs;
+      sp.valueField.setText(String.valueOf(ccs.getConservationInc()));
     }
 
     conservationSlider
@@ -135,6 +134,7 @@ public class SliderPanel extends Panel implements ActionListener,
     {
       pid = (SliderPanel) PIDSlider.getComponent(0);
       pid.cs = ccs;
+      pid.valueField.setText(String.valueOf(ccs.getThreshold()));
     }
     PIDSlider
             .setTitle(MessageManager.formatMessage(