git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
gui
/
SliderPanel.java
diff --git
a/src/jalview/gui/SliderPanel.java
b/src/jalview/gui/SliderPanel.java
index
93a2457
..
5e1357a
100755
(executable)
--- a/
src/jalview/gui/SliderPanel.java
+++ b/
src/jalview/gui/SliderPanel.java
@@
-20,12
+20,6
@@
*/
package jalview.gui;
*/
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;
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 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!
*
/**
* DOCUMENT ME!
*
@@
-117,7
+117,7
@@
public class SliderPanel extends GSliderPanel
@Override
public void stateChanged(ChangeEvent evt)
{
@Override
public void stateChanged(ChangeEvent evt)
{
- valueField.setText(slider.getValue() + "");
+ valueField.setText(String.valueOf(slider.getValue()));
valueChanged(slider.getValue());
}
});
valueChanged(slider.getValue());
}
});
@@
-132,7
+132,7
@@
public class SliderPanel extends GSliderPanel
});
slider.setValue(value);
});
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);
if (groups != null && !groups.isEmpty())
{
sliderPanel.setAllGroupsCheckEnabled(true);
+ sliderPanel.allGroupsCheck
+ .setSelected(ap.av.getColourAppliesToAllGroups());
}
else
{
}
else
{
@@
-230,7
+232,8
@@
public class SliderPanel extends GSliderPanel
if (!conservationSlider.isVisible())
{
Desktop.addInternalFrame(conservationSlider,
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
conservationSlider.addInternalFrameListener(new InternalFrameAdapter()
{
@Override
@@
-305,8
+308,8
@@
public class SliderPanel extends GSliderPanel
if (!PIDSlider.isVisible())
{
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()
{
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);
public void setAllGroupsCheckEnabled(boolean b)
{
allGroupsCheck.setEnabled(b);
- allGroupsCheck.setSelected(ap.av.getColourAppliesToAllGroups());
}
/**
}
/**