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 'doc/JAL-4090_Release_2_11_3_0' into develop
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureSettings.java
diff --git
a/src/jalview/appletgui/FeatureSettings.java
b/src/jalview/appletgui/FeatureSettings.java
index
ad04171
..
489cbb1
100755
(executable)
--- a/
src/jalview/appletgui/FeatureSettings.java
+++ b/
src/jalview/appletgui/FeatureSettings.java
@@
-66,7
+66,7
@@
import java.util.Set;
public class FeatureSettings extends Panel
implements ItemListener, MouseListener, MouseMotionListener,
public class FeatureSettings extends Panel
implements ItemListener, MouseListener, MouseMotionListener,
- ActionListener, AdjustmentListener, FeatureSettingsControllerI
+ AdjustmentListener, FeatureSettingsControllerI
{
FeatureRenderer fr;
{
FeatureRenderer fr;
@@
-121,8
+121,17
@@
public class FeatureSettings extends Panel
add(scrollPane, BorderLayout.CENTER);
}
add(scrollPane, BorderLayout.CENTER);
}
- Button invert = new Button("Invert Selection");
- invert.addActionListener(this);
+ Button invert = new Button(
+ MessageManager.getString("label.invert_selection"));
+ invert.addActionListener(new ActionListener()
+ {
+
+ @Override
+ public void actionPerformed(ActionEvent e)
+ {
+ invertSelection();
+ }
+ });
Panel lowerPanel = new Panel(new GridLayout(2, 1, 5, 10));
lowerPanel.add(invert);
Panel lowerPanel = new Panel(new GridLayout(2, 1, 5, 10));
lowerPanel.add(invert);
@@
-546,8
+555,7
@@
public class FeatureSettings extends Panel
}
}
}
}
- @Override
- public void actionPerformed(ActionEvent evt)
+ protected void invertSelection()
{
for (int i = 0; i < featurePanel.getComponentCount(); i++)
{
{
for (int i = 0; i < featurePanel.getComponentCount(); i++)
{
@@
-695,7
+703,7
@@
public class FeatureSettings extends Panel
public void mouseClicked(MouseEvent evt)
{
MyCheckbox check = (MyCheckbox) evt.getSource();
public void mouseClicked(MouseEvent evt)
{
MyCheckbox check = (MyCheckbox) evt.getSource();
- if ((evt.getModifiers() & InputEvent.BUTTON3_MASK) != 0)
+ if ((evt.getModifiersEx() & InputEvent.BUTTON3_DOWN_MASK) != 0)
{
this.popupSort(check, fr.getMinMax(), evt.getX(), evt.getY());
}
{
this.popupSort(check, fr.getMinMax(), evt.getX(), evt.getY());
}