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 remote-tracking branch 'origin/develop' into features/JAL-2316
[jalview.git]
/
src
/
jalview
/
gui
/
PopupMenu.java
diff --git
a/src/jalview/gui/PopupMenu.java
b/src/jalview/gui/PopupMenu.java
index
e186145
..
c94d24d
100644
(file)
--- a/
src/jalview/gui/PopupMenu.java
+++ b/
src/jalview/gui/PopupMenu.java
@@
-1261,7
+1261,7
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- abovePIDColour_actionPerformed();
+ abovePIDColour_actionPerformed(abovePIDColour.isSelected());
}
});
}
});
@@
-1283,7
+1283,8
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- conservationMenuItem_actionPerformed();
+ conservationMenuItem_actionPerformed(conservationMenuItem
+ .isSelected());
}
});
}
});
@@
-1528,10
+1529,12
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
/**
* DOCUMENT ME!
*
/**
* DOCUMENT ME!
*
+ * @param selected
+ *
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- protected void abovePIDColour_actionPerformed()
+ public void abovePIDColour_actionPerformed(boolean selected)
{
SequenceGroup sg = getGroup();
if (sg.cs == null)
{
SequenceGroup sg = getGroup();
if (sg.cs == null)
@@
-1539,7
+1542,6
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
return;
}
return;
}
- boolean selected = abovePIDColour.isSelected();
if (selected)
{
sg.cs.setConsensus(AAFrequency.calculate(
if (selected)
{
sg.cs.setConsensus(AAFrequency.calculate(
@@
-1583,7
+1585,7
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
- protected void conservationMenuItem_actionPerformed()
+ public void conservationMenuItem_actionPerformed(boolean selected)
{
SequenceGroup sg = getGroup();
if (sg.cs == null)
{
SequenceGroup sg = getGroup();
if (sg.cs == null)
@@
-1591,7
+1593,6
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
return;
}
return;
}
- boolean selected = conservationMenuItem.isSelected();
if (selected)
{
// JBPNote: Conservation name shouldn't be i18n translated
if (selected)
{
// JBPNote: Conservation name shouldn't be i18n translated
@@
-1999,6
+2000,8
@@
public class PopupMenu extends JPopupMenu implements ColourChangeListener
/**
* Action on user selecting an item from the colour menu (that does not have
* its bespoke action handler)
/**
* Action on user selecting an item from the colour menu (that does not have
* its bespoke action handler)
+ *
+ * @return
*/
@Override
public void changeColour_actionPerformed(String colourSchemeName)
*/
@Override
public void changeColour_actionPerformed(String colourSchemeName)