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
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
src
/
jalview
/
gui
/
TreeCanvas.java
diff --git
a/src/jalview/gui/TreeCanvas.java
b/src/jalview/gui/TreeCanvas.java
index
279d9ad
..
0e513f7
100755
(executable)
--- a/
src/jalview/gui/TreeCanvas.java
+++ b/
src/jalview/gui/TreeCanvas.java
@@
-29,7
+29,6
@@
import jalview.datamodel.SequenceI;
import jalview.datamodel.SequenceNode;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
import jalview.datamodel.SequenceNode;
import jalview.schemes.ColourSchemeI;
import jalview.schemes.ColourSchemeProperty;
-import jalview.schemes.ResidueProperties;
import jalview.schemes.UserColourScheme;
import jalview.structure.SelectionSource;
import jalview.util.Format;
import jalview.schemes.UserColourScheme;
import jalview.structure.SelectionSource;
import jalview.util.Format;
@@
-755,6
+754,14
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
@Override
public void mouseReleased(MouseEvent e)
{
@Override
public void mouseReleased(MouseEvent e)
{
+ /*
+ * isPopupTrigger is set on mouseReleased on Windows
+ */
+ if (e.isPopupTrigger())
+ {
+ chooseSubtreeColour();
+ e.consume(); // prevent mouseClicked happening
+ }
}
/**
}
/**
@@
-792,15
+799,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
return;
}
return;
}
- /*
- * isPopupTrigger is set on mouseReleased /
- * mouseClicked on Windows
- */
- if (evt.isPopupTrigger())
- {
- chooseSubtreeColour();
- }
- else if (evt.getClickCount() > 1)
+ if (evt.getClickCount() > 1)
{
tree.swapNodes(highlightNode);
tree.reCount(tree.getTopNode());
{
tree.swapNodes(highlightNode);
tree.reCount(tree.getTopNode());
@@
-812,8
+811,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
for (int i = 0; i < leaves.size(); i++)
{
for (int i = 0; i < leaves.size(); i++)
{
- SequenceI seq = (SequenceI) leaves.elementAt(i)
- .element();
+ SequenceI seq = (SequenceI) leaves.elementAt(i).element();
treeSelectionChanged(seq);
}
av.sendSelection();
treeSelectionChanged(seq);
}
av.sendSelection();
@@
-887,7
+885,7
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
/*
* isPopupTrigger is set for mousePressed (Mac)
/*
* isPopupTrigger is set for mousePressed (Mac)
- * or mouseReleased / mouseClicked (Windows)
+ * or mouseReleased (Windows)
*/
if (e.isPopupTrigger())
{
*/
if (e.isPopupTrigger())
{
@@
-967,17
+965,16
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
{
Color col = new Color((int) (Math.random() * 255),
(int) (Math.random() * 255), (int) (Math.random() * 255));
{
Color col = new Color((int) (Math.random() * 255),
(int) (Math.random() * 255), (int) (Math.random() * 255));
- setColor((SequenceNode) tree.getGroups().elementAt(i), col.brighter());
+ setColor(tree.getGroups().elementAt(i), col.brighter());
- Vector<SequenceNode> l = tree.findLeaves((SequenceNode) tree
- .getGroups().elementAt(i));
+ Vector<SequenceNode> l = tree.findLeaves(tree.getGroups()
+ .elementAt(i));
Vector<SequenceI> sequences = new Vector<SequenceI>();
for (int j = 0; j < l.size(); j++)
{
Vector<SequenceI> sequences = new Vector<SequenceI>();
for (int j = 0; j < l.size(); j++)
{
- SequenceI s1 = (SequenceI) l.elementAt(j)
- .element();
+ SequenceI s1 = (SequenceI) l.elementAt(j).element();
if (!sequences.contains(s1))
{
if (!sequences.contains(s1))
{
@@
-1020,10
+1017,8
@@
public class TreeCanvas extends JPanel implements MouseListener, Runnable,
if (aps[a].av.getGlobalColourScheme() != null
&& aps[a].av.getGlobalColourScheme().conservationApplied())
{
if (aps[a].av.getGlobalColourScheme() != null
&& aps[a].av.getGlobalColourScheme().conservationApplied())
{
- Conservation c = new Conservation("Group",
- ResidueProperties.propHash, 3, sg.getSequences(null),
- sg.getStartRes(), sg.getEndRes());
-
+ Conservation c = new Conservation("Group", 3,
+ sg.getSequences(null), sg.getStartRes(), sg.getEndRes());
c.calculate();
c.verdict(false, aps[a].av.getConsPercGaps());
sg.cs.setConservation(c);
c.calculate();
c.verdict(false, aps[a].av.getConsPercGaps());
sg.cs.setConservation(c);