Merge branch 'develop' into trialMerge

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

diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index f98139b..46b47a2 100755 (executable)
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -118,7 +118,7 @@ public class SliderPanel extends GSliderPanel
       @Override
       public void stateChanged(ChangeEvent evt)
       {
-        valueField.setText(slider.getValue() + "");
+        valueField.setText(String.valueOf(slider.getValue()));
         valueChanged(slider.getValue());
       }
     });
@@ -133,7 +133,7 @@ public class SliderPanel extends GSliderPanel
     });
 
     slider.setValue(value);
-    valueField.setText(value + "");
+    valueField.setText(String.valueOf(value));
   }
 
   /**
@@ -231,7 +231,8 @@ public class SliderPanel extends GSliderPanel
     if (!conservationSlider.isVisible())
     {
       Desktop.addInternalFrame(conservationSlider,
-              conservationSlider.getTitle(), 420, 90, false);
+              conservationSlider.getTitle(), true, FRAME_WIDTH,
+              FRAME_HEIGHT, false, true);
       conservationSlider.addInternalFrameListener(new InternalFrameAdapter()
       {
         @Override
@@ -306,8 +307,8 @@ public class SliderPanel extends GSliderPanel
 
     if (!PIDSlider.isVisible())
     {
-      Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), 420, 90,
-              false);
+      Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), true,
+              FRAME_WIDTH, FRAME_HEIGHT, false, true);
       PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
       PIDSlider.addInternalFrameListener(new InternalFrameAdapter()
       {
@@ -497,13 +498,4 @@ public class SliderPanel extends GSliderPanel
     }
     return title;
   }
-
-  @Override
-  protected void allGroupsCheck_actionPerformed(ActionEvent e)
-  {
-    if (allGroupsCheck.isSelected())
-    {
-      valueChanged(slider.getValue());
-    }
-  }
 }