Merge branch 'develop' into features/JAL-2360colourSchemeApplicability

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

diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
index 5179eb0..b52fae9 100644 (file)
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -73,6 +73,7 @@ public class SliderPanel extends Panel implements ActionListener,
     else
     {
       sp = (SliderPanel) conservationSlider.getComponent(0);
+      sp.valueField.setText(String.valueOf(cs.getConservationInc()));
       sp.cs = cs;
     }
 
@@ -132,6 +133,7 @@ public class SliderPanel extends Panel implements ActionListener,
     else
     {
       pid = (SliderPanel) PIDSlider.getComponent(0);
+      pid.valueField.setText(String.valueOf(cs.getThreshold()));
       pid.cs = cs;
     }
     PIDSlider
@@ -186,8 +188,8 @@ public class SliderPanel extends Panel implements ActionListener,
     if (PIDSlider != null)
     {
       PIDSlider.setVisible(false);
+      PIDSlider = null;
     }
-    PIDSlider = null;
   }
 
   /**
@@ -198,8 +200,8 @@ public class SliderPanel extends Panel implements ActionListener,
     if (conservationSlider != null)
     {
       conservationSlider.setVisible(false);
+      conservationSlider = null;
     }
-    conservationSlider = null;
   }
   public SliderPanel(AlignmentPanel ap, int value, boolean forConserve,
           ColourSchemeI cs)