X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=46b47a28fa6b4eb1f7c986c2bcce91a80901e8f0;hb=4f77328104498504339216829abf5ea87e2791ec;hp=31ad0836f03accf1c9ceac9c7334cbfad043835d;hpb=2b8c0785318a3528e1876e8e2dd48b7d831eae69;p=jalview.git

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index 31ad083..46b47a2 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -26,6 +26,7 @@ import jalview.jbgui.GSliderPanel;
 import jalview.renderer.ResidueShaderI;
 import jalview.util.MessageManager;
 
+import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.beans.PropertyVetoException;
@@ -44,11 +45,14 @@ import javax.swing.event.InternalFrameEvent;
  * @author $author$
  * @version $Revision$
  */
-@SuppressWarnings("serial")
 public class SliderPanel extends GSliderPanel
 {
   private static final String BACKGROUND = "Background";
 
+  static JInternalFrame conservationSlider;
+
+  static JInternalFrame PIDSlider;
+
   AlignmentPanel ap;
 
   boolean forConservation = true;
@@ -62,12 +66,6 @@ public class SliderPanel extends GSliderPanel
    */
   public static SliderPanel getSliderPanel()
   {
-
-    JInternalFrame conservationSlider = Desktop
-            .getInstance().conservationSlider;
-
-    JInternalFrame PIDSlider = Desktop.getInstance().PIDSlider;
-
     if (conservationSlider != null && conservationSlider.isVisible())
     {
       return (SliderPanel) conservationSlider.getContentPane();
@@ -155,14 +153,10 @@ public class SliderPanel extends GSliderPanel
   {
     SliderPanel sliderPanel = null;
 
-    JInternalFrame conservationSlider = Desktop
-            .getInstance().conservationSlider;
-
     if (conservationSlider == null)
     {
       sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs);
-      conservationSlider = Desktop
-              .getInstance().conservationSlider = new JInternalFrame();
+      conservationSlider = new JInternalFrame();
       conservationSlider.setContentPane(sliderPanel);
       conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
@@ -198,14 +192,12 @@ public class SliderPanel extends GSliderPanel
    */
   public static void hidePIDSlider()
   {
-    JInternalFrame PIDSlider = Desktop.getInstance().PIDSlider;
-
     if (PIDSlider != null)
     {
       try
       {
         PIDSlider.setClosed(true);
-        Desktop.getInstance().PIDSlider = null;
+        PIDSlider = null;
       } catch (PropertyVetoException ex)
       {
       }
@@ -217,15 +209,12 @@ public class SliderPanel extends GSliderPanel
    */
   public static void hideConservationSlider()
   {
-    JInternalFrame conservationSlider = Desktop
-            .getInstance().conservationSlider;
-
     if (conservationSlider != null)
     {
       try
       {
         conservationSlider.setClosed(true);
-        Desktop.getInstance().conservationSlider = null;
+        conservationSlider = null;
       } catch (PropertyVetoException ex)
       {
       }
@@ -239,9 +228,6 @@ public class SliderPanel extends GSliderPanel
   {
     hidePIDSlider();
 
-    JInternalFrame conservationSlider = Desktop
-            .getInstance().conservationSlider;
-
     if (!conservationSlider.isVisible())
     {
       Desktop.addInternalFrame(conservationSlider,
@@ -252,7 +238,7 @@ public class SliderPanel extends GSliderPanel
         @Override
         public void internalFrameClosed(InternalFrameEvent e)
         {
-          Desktop.getInstance().conservationSlider = null;
+          conservationSlider = null;
         }
       });
       conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -278,12 +264,10 @@ public class SliderPanel extends GSliderPanel
 
     SliderPanel sliderPanel = null;
 
-    JInternalFrame PIDSlider = Desktop.getInstance().PIDSlider;
-
     if (PIDSlider == null)
     {
       sliderPanel = new SliderPanel(ap, threshold, false, rs);
-      PIDSlider = Desktop.getInstance().PIDSlider = new JInternalFrame();
+      PIDSlider = new JInternalFrame();
       PIDSlider.setContentPane(sliderPanel);
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
     }
@@ -321,8 +305,6 @@ public class SliderPanel extends GSliderPanel
   {
     hideConservationSlider();
 
-    JInternalFrame PIDSlider = Desktop.getInstance().PIDSlider;
-
     if (!PIDSlider.isVisible())
     {
       Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), true,
@@ -333,7 +315,7 @@ public class SliderPanel extends GSliderPanel
         @Override
         public void internalFrameClosed(InternalFrameEvent e)
         {
-          Desktop.getInstance().PIDSlider = null;
+          PIDSlider = null;
         }
       });
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
@@ -469,7 +451,7 @@ public class SliderPanel extends GSliderPanel
 
   public static int getConservationValue()
   {
-    return getValue(Desktop.getInstance().conservationSlider);
+    return getValue(conservationSlider);
   }
 
   static int getValue(JInternalFrame slider)
@@ -480,7 +462,7 @@ public class SliderPanel extends GSliderPanel
 
   public static int getPIDValue()
   {
-    return getValue(Desktop.getInstance().PIDSlider);
+    return getValue(PIDSlider);
   }
 
   /**
@@ -503,10 +485,6 @@ public class SliderPanel extends GSliderPanel
   public String getTitle()
   {
     String title = null;
-    JInternalFrame conservationSlider = Desktop
-            .getInstance().conservationSlider;
-    JInternalFrame PIDSlider = Desktop.getInstance().PIDSlider;
-
     if (isForConservation())
     {
       if (conservationSlider != null)