X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=5e1357af6af467960f7397cddf62fad156648b4b;hb=0862857e6b49fefb790d20495b190a55b7b611f6;hp=f98139b75d952d767e1837ae8b1bde50ece70cf2;hpb=928017f8d5b3b70273b62ac83a9015fe2e785ff3;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index f98139b..5e1357a 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -20,13 +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.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.beans.PropertyVetoException; @@ -39,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! * @@ -118,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()); } }); @@ -133,7 +132,7 @@ public class SliderPanel extends GSliderPanel }); slider.setValue(value); - valueField.setText(value + ""); + valueField.setText(String.valueOf(value)); } /** @@ -178,6 +177,8 @@ public class SliderPanel extends GSliderPanel if (groups != null && !groups.isEmpty()) { sliderPanel.setAllGroupsCheckEnabled(true); + sliderPanel.allGroupsCheck + .setSelected(ap.av.getColourAppliesToAllGroups()); } else { @@ -231,7 +232,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 +308,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 +499,4 @@ public class SliderPanel extends GSliderPanel } return title; } - - @Override - protected void allGroupsCheck_actionPerformed(ActionEvent e) - { - if (allGroupsCheck.isSelected()) - { - valueChanged(slider.getValue()); - } - } }