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 bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
SliderPanel.java
diff --git
a/src/jalview/gui/SliderPanel.java
b/src/jalview/gui/SliderPanel.java
index
f98139b
..
1d59853
100755
(executable)
--- a/
src/jalview/gui/SliderPanel.java
+++ b/
src/jalview/gui/SliderPanel.java
@@
-20,13
+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.ActionEvent;
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;
@@
-39,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!
*
@@
-118,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());
}
});
@@
-133,7
+132,7
@@
public class SliderPanel extends GSliderPanel
});
slider.setValue(value);
});
slider.setValue(value);
- valueField.setText(value + "");
+ valueField.setText(String.valueOf(value));
}
/**
}
/**
@@
-157,6
+156,7
@@
public class SliderPanel extends GSliderPanel
{
sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs);
conservationSlider = new JInternalFrame();
{
sliderPanel = new SliderPanel(ap, rs.getConservationInc(), true, rs);
conservationSlider = new JInternalFrame();
+ conservationSlider.setFrameIcon(null);
conservationSlider.setContentPane(sliderPanel);
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
conservationSlider.setContentPane(sliderPanel);
conservationSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
@@
-178,6
+178,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
{
@@
-231,7
+233,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
@@
-267,6
+270,7
@@
public class SliderPanel extends GSliderPanel
{
sliderPanel = new SliderPanel(ap, threshold, false, rs);
PIDSlider = new JInternalFrame();
{
sliderPanel = new SliderPanel(ap, threshold, false, rs);
PIDSlider = new JInternalFrame();
+ PIDSlider.setFrameIcon(null);
PIDSlider.setContentPane(sliderPanel);
PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
PIDSlider.setContentPane(sliderPanel);
PIDSlider.setLayer(JLayeredPane.PALETTE_LAYER);
}
@@
-306,8
+310,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()
{
@@
-497,13
+501,4
@@
public class SliderPanel extends GSliderPanel
}
return title;
}
}
return title;
}
-
- @Override
- protected void allGroupsCheck_actionPerformed(ActionEvent e)
- {
- if (allGroupsCheck.isSelected())
- {
- valueChanged(slider.getValue());
- }
- }
}
}