X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=b830d5db30bbc25c5cb115dfb108acf3818deada;hb=e25f63a72efddff9e071abdeff0ae5599431e4f8;hp=a9020c31d312a3ff4186b7a0f7e1d23088f232a5;hpb=9fff97021c2c637e426f6971d54dcf3fd4191985;p=jalview.git

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index a9020c3..b830d5d 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -67,7 +67,7 @@ public class SliderPanel extends GSliderPanel
         {
             label.setText("Enter value to increase conservation visibility");
             slider.setMinimum(0);
-            slider.setMaximum(50);
+            slider.setMaximum(100);
         }
         else
         {
@@ -89,6 +89,7 @@ public class SliderPanel extends GSliderPanel
         valueField.setText(value + "");
     }
 
+
     /**
      * DOCUMENT ME!
      *
@@ -102,11 +103,10 @@ public class SliderPanel extends GSliderPanel
         ColourSchemeI cs, String source)
     {
         SliderPanel sp = null;
-        ConservationColourScheme ccs = (ConservationColourScheme) cs;
 
         if (conservationSlider == null)
         {
-            sp = new SliderPanel(ap, ccs.inc, true, cs);
+            sp = new SliderPanel(ap, cs.getConservationInc(), true, cs);
             conservationSlider = new JInternalFrame();
             conservationSlider.setContentPane(sp);
             conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -176,16 +176,7 @@ public class SliderPanel extends GSliderPanel
     {
         SliderPanel pid = null;
 
-        int threshold = 50;
-
-        if (cs instanceof ResidueColourScheme)
-        {
-            threshold = (((ResidueColourScheme) cs).getThreshold());
-        }
-        else if (cs instanceof ScoreColourScheme)
-        {
-            threshold = (((ScoreColourScheme) cs).getThreshold());
-        }
+        int threshold = cs.getThreshold();
 
         if (PIDSlider == null)
         {
@@ -271,6 +262,7 @@ public class SliderPanel extends GSliderPanel
             toChange = cs;
         }
 
+
         while (groupIndex > -1)
         {
             if (allGroups != null)
@@ -287,14 +279,14 @@ public class SliderPanel extends GSliderPanel
 
             if (forConservation)
             {
-                if (toChange instanceof ConservationColourScheme)
+                if (toChange.conservationApplied())
                 {
-                    ((ConservationColourScheme) toChange).inc = i;
+                    toChange.setConservationInc(i);
                 }
             }
             else
             {
-                ((ResidueColourScheme) toChange).setThreshold(i, ap.av.getIgnoreGapsConsensus());
+                toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
             }
 
             groupIndex--;
@@ -325,7 +317,7 @@ public class SliderPanel extends GSliderPanel
             int i = Integer.parseInt(valueField.getText());
             slider.setValue(i);
         }
-        catch (Exception ex)
+        catch (NumberFormatException ex)
         {
             valueField.setText(slider.getValue() + "");
         }