X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=bd612b505b48b15d0a0ccc34133b471696ce1647;hb=d043ce47fc710d3eb2629ba926a8a7417bd67d8c;hp=93a245759ac2d6527fe1b124972f280e843e9a36;hpb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 93a2457..bd612b5 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -20,12 +20,6 @@ */ package jalview.gui; -import jalview.analysis.Conservation; -import jalview.datamodel.SequenceGroup; -import jalview.jbgui.GSliderPanel; -import jalview.renderer.ResidueShaderI; -import jalview.util.MessageManager; - import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyVetoException; @@ -38,6 +32,12 @@ import javax.swing.event.ChangeListener; import javax.swing.event.InternalFrameAdapter; import javax.swing.event.InternalFrameEvent; +import jalview.analysis.Conservation; +import jalview.datamodel.SequenceGroup; +import jalview.jbgui.GSliderPanel; +import jalview.renderer.ResidueShaderI; +import jalview.util.MessageManager; + /** * DOCUMENT ME! * @@ -117,7 +117,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()); } }); @@ -132,7 +132,7 @@ public class SliderPanel extends GSliderPanel }); slider.setValue(value); - valueField.setText(value + ""); + valueField.setText(String.valueOf(value)); } /** @@ -177,6 +177,8 @@ public class SliderPanel extends GSliderPanel if (groups != null && !groups.isEmpty()) { sliderPanel.setAllGroupsCheckEnabled(true); + sliderPanel.allGroupsCheck + .setSelected(ap.av.getColourAppliesToAllGroups()); } else { @@ -230,7 +232,8 @@ public class SliderPanel extends GSliderPanel if (!conservationSlider.isVisible()) { Desktop.addInternalFrame(conservationSlider, - conservationSlider.getTitle(), 420, 90, false); + conservationSlider.getTitle(), Desktop.FRAME_MAKE_VISIBLE, FRAME_WIDTH, + FRAME_HEIGHT, Desktop.FRAME_NOT_RESIZABLE, Desktop.FRAME_ALLOW_ANY_SIZE); conservationSlider.addInternalFrameListener(new InternalFrameAdapter() { @Override @@ -305,8 +308,8 @@ public class SliderPanel extends GSliderPanel if (!PIDSlider.isVisible()) { - Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), 420, 90, - false); + Desktop.addInternalFrame(PIDSlider, PIDSlider.getTitle(), Desktop.FRAME_MAKE_VISIBLE, + FRAME_WIDTH, FRAME_HEIGHT, Desktop.FRAME_NOT_RESIZABLE, Desktop.FRAME_ALLOW_ANY_SIZE); PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER); PIDSlider.addInternalFrameListener(new InternalFrameAdapter() { @@ -396,7 +399,6 @@ public class SliderPanel extends GSliderPanel public void setAllGroupsCheckEnabled(boolean b) { allGroupsCheck.setEnabled(b); - allGroupsCheck.setSelected(ap.av.getColourAppliesToAllGroups()); } /**