git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
4bd4726
)
JAL-2110 avoid potential race condition where user changes selection after ‘show...
author
Jim Procter
<jprocter@issues.jalview.org>
Tue, 12 Jul 2016 16:28:55 +0000
(17:28 +0100)
committer
Jim Procter
<jprocter@issues.jalview.org>
Tue, 12 Jul 2016 16:28:55 +0000
(17:28 +0100)
src/jalview/gui/AlignFrame.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/AlignFrame.java
b/src/jalview/gui/AlignFrame.java
index
3f572e8
..
04cee93
100644
(file)
--- a/
src/jalview/gui/AlignFrame.java
+++ b/
src/jalview/gui/AlignFrame.java
@@
-4734,13
+4734,10
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
AlignmentI xrefsAlignment = makeCrossReferencesAlignment(dataset,
xrefs);
AlignmentI xrefsAlignment = makeCrossReferencesAlignment(dataset,
xrefs);
- final SequenceI[] sequenceSelection = AlignFrame.this.viewport
- .getSequenceSelection();
if (!dna)
{
xrefsAlignment = AlignmentUtils.makeCdsAlignment(
if (!dna)
{
xrefsAlignment = AlignmentUtils.makeCdsAlignment(
- xrefsAlignment.getSequencesArray(), dataset,
- sequenceSelection);
+ xrefsAlignment.getSequencesArray(), dataset, sel);
xrefsAlignment.alignAs(alignment);
}
xrefsAlignment.alignAs(alignment);
}
@@
-4773,8
+4770,7
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
boolean copyAlignmentIsAligned = false;
if (dna)
{
boolean copyAlignmentIsAligned = false;
if (dna)
{
- copyAlignment = AlignmentUtils.makeCdsAlignment(
- sequenceSelection, dataset,
+ copyAlignment = AlignmentUtils.makeCdsAlignment(sel, dataset,
xrefsAlignment.getSequencesArray());
if (copyAlignment.getHeight() == 0)
{
xrefsAlignment.getSequencesArray());
if (copyAlignment.getHeight() == 0)
{
@@
-4795,8
+4791,8
@@
public class AlignFrame extends GAlignFrame implements DropTargetListener,
}
else
{
}
else
{
- copyAlignment = AlignmentUtils.makeCopyAlignment(
- sequenceSelection, xrefs.getSequencesArray(), dataset);
+ copyAlignment = AlignmentUtils.makeCopyAlignment(sel,
+ xrefs.getSequencesArray(), dataset);
}
copyAlignment.setGapCharacter(AlignFrame.this.viewport
.getGapCharacter());
}
copyAlignment.setGapCharacter(AlignFrame.this.viewport
.getGapCharacter());