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-2473 removed unused fields in JalviewDialog
[jalview.git]
/
src
/
jalview
/
datamodel
/
Alignment.java
diff --git
a/src/jalview/datamodel/Alignment.java
b/src/jalview/datamodel/Alignment.java
index
db6195a
..
2dafc0c
100755
(executable)
--- a/
src/jalview/datamodel/Alignment.java
+++ b/
src/jalview/datamodel/Alignment.java
@@
-338,15
+338,18
@@
public class Alignment implements AlignmentI
@Override
public void deleteSequence(SequenceI s)
{
@Override
public void deleteSequence(SequenceI s)
{
- deleteSequence(findIndex(s));
+ synchronized (sequences)
+ {
+ deleteSequence(findIndex(s));
+ }
}
@Override
public void deleteSequence(int i)
{
}
@Override
public void deleteSequence(int i)
{
- if (i > -1 && i < getHeight())
+ synchronized (sequences)
{
{
- synchronized (sequences)
+ if (i > -1 && i < getHeight())
{
sequences.remove(i);
hiddenSequences.adjustHeightSequenceDeleted(i);
{
sequences.remove(i);
hiddenSequences.adjustHeightSequenceDeleted(i);
@@
-357,9
+360,9
@@
public class Alignment implements AlignmentI
@Override
public void deleteHiddenSequence(int i)
{
@Override
public void deleteHiddenSequence(int i)
{
- if (i > -1 && i < getHeight())
+ synchronized (sequences)
{
{
- synchronized (sequences)
+ if (i > -1 && i < getHeight())
{
sequences.remove(i);
}
{
sequences.remove(i);
}
@@
-1008,6
+1011,10
@@
public class Alignment implements AlignmentI
}
else if (dataset == null && data != null)
{
}
else if (dataset == null && data != null)
{
+ if (data == this)
+ {
+ throw new IllegalArgumentException("Circular dataset reference");
+ }
if (!(data instanceof Alignment))
{
throw new Error(
if (!(data instanceof Alignment))
{
throw new Error(