JAL-2386 unit tests for change colour (and minor refactoring for

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

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index 4600ab7..40f86b8 100755 (executable)
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -54,6 +54,18 @@ public class SliderPanel extends GSliderPanel
 
   CollectionColourSchemeI cs;
 
+  private static SliderPanel sliderPanel;
+
+  /**
+   * Returns the currently active slider panel (or null if none).
+   * 
+   * @return
+   */
+  public static SliderPanel getSliderPanel()
+  {
+    return sliderPanel;
+  }
+
   /**
    * Creates a new SliderPanel object.
    * 
@@ -128,20 +140,20 @@ public class SliderPanel extends GSliderPanel
   public static int setConservationSlider(AlignmentPanel ap,
           CollectionColourSchemeI ccs, String source)
   {
-    SliderPanel sp = null;
+    sliderPanel = null;
 
     if (conservationSlider == null)
     {
-      sp = new SliderPanel(ap, ccs.getConservationInc(), true, ccs);
+      sliderPanel = new SliderPanel(ap, ccs.getConservationInc(), true, ccs);
       conservationSlider = new JInternalFrame();
-      conservationSlider.setContentPane(sp);
+      conservationSlider.setContentPane(sliderPanel);
       conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
     else
     {
-      sp = (SliderPanel) conservationSlider.getContentPane();
-      sp.valueField.setText(String.valueOf(ccs.getConservationInc()));
-      sp.cs = ccs;
+      sliderPanel = (SliderPanel) conservationSlider.getContentPane();
+      sliderPanel.valueField.setText(String.valueOf(ccs.getConservationInc()));
+      sliderPanel.cs = ccs;
     }
 
     conservationSlider
@@ -151,14 +163,14 @@ public class SliderPanel extends GSliderPanel
 
     if (ap.av.getAlignment().getGroups() != null)
     {
-      sp.setAllGroupsCheckEnabled(true);
+      sliderPanel.setAllGroupsCheckEnabled(true);
     }
     else
     {
-      sp.setAllGroupsCheckEnabled(false);
+      sliderPanel.setAllGroupsCheckEnabled(false);
     }
 
-    return sp.getValue();
+    return sliderPanel.getValue();
   }
 
   /**
@@ -234,22 +246,20 @@ public class SliderPanel extends GSliderPanel
   public static int setPIDSliderSource(AlignmentPanel ap,
           CollectionColourSchemeI ccs, String source)
   {
-    SliderPanel pid = null;
-
     int threshold = ccs.getThreshold();
 
     if (PIDSlider == null)
     {
-      pid = new SliderPanel(ap, threshold, false, ccs);
+      sliderPanel = new SliderPanel(ap, threshold, false, ccs);
       PIDSlider = new JInternalFrame();
-      PIDSlider.setContentPane(pid);
+      PIDSlider.setContentPane(sliderPanel);
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
     else
     {
-      pid = (SliderPanel) PIDSlider.getContentPane();
-      pid.cs = ccs;
-      pid.valueField.setText(String.valueOf(ccs.getThreshold()));
+      sliderPanel = (SliderPanel) PIDSlider.getContentPane();
+      sliderPanel.cs = ccs;
+      sliderPanel.valueField.setText(String.valueOf(ccs.getThreshold()));
     }
 
     PIDSlider
@@ -259,20 +269,22 @@ public class SliderPanel extends GSliderPanel
 
     if (ap.av.getAlignment().getGroups() != null)
     {
-      pid.setAllGroupsCheckEnabled(true);
+      sliderPanel.setAllGroupsCheckEnabled(true);
     }
     else
     {
-      pid.setAllGroupsCheckEnabled(false);
+      sliderPanel.setAllGroupsCheckEnabled(false);
     }
 
-    return pid.getValue();
+    return sliderPanel.getValue();
   }
 
   /**
    * DOCUMENT ME!
+   * 
+   * @return
    */
-  public static void showPIDSlider()
+  public static JInternalFrame showPIDSlider()
   {
     hideConservationSlider();
 
@@ -291,6 +303,7 @@ public class SliderPanel extends GSliderPanel
       });
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
+    return PIDSlider;
   }
 
   /**
@@ -418,4 +431,37 @@ public class SliderPanel extends GSliderPanel
     return getValue(PIDSlider);
   }
 
+  /**
+   * Answers true if the SliderPanel is for Conservation, false if it is for PID
+   * threshold
+   * 
+   * @return
+   */
+  public boolean isForConservation()
+  {
+    return forConservation;
+  }
+
+  /**
+   * Answers the title for the slider panel; this may include 'Background' if
+   * for the alignment, or the group id if for a group
+   * 
+   * @return
+   */
+  public String getTitle()
+  {
+    String title = null;
+    if (isForConservation())
+    {
+      if (conservationSlider != null)
+      {
+        title = conservationSlider.getTitle();
+      }
+    }
+    else if (PIDSlider != null)
+    {
+      title = PIDSlider.getTitle();
+    }
+    return title;
+  }
 }