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-1645 licencing for help html
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcManager.java
diff --git
a/src/jalview/workers/AlignCalcManager.java
b/src/jalview/workers/AlignCalcManager.java
index
24de71e
..
1063706
100644
(file)
--- a/
src/jalview/workers/AlignCalcManager.java
+++ b/
src/jalview/workers/AlignCalcManager.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,6
+20,10
@@
*/
package jalview.workers;
*/
package jalview.workers;
+import jalview.api.AlignCalcManagerI;
+import jalview.api.AlignCalcWorkerI;
+import jalview.datamodel.AlignmentAnnotation;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
@@
-28,10
+32,6
@@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map;
import java.util.Set;
-import jalview.api.AlignCalcManagerI;
-import jalview.api.AlignCalcWorkerI;
-import jalview.datamodel.AlignmentAnnotation;
-
public class AlignCalcManager implements AlignCalcManagerI
{
private volatile List<AlignCalcWorkerI> restartable = Collections
public class AlignCalcManager implements AlignCalcManagerI
{
private volatile List<AlignCalcWorkerI> restartable = Collections
@@
-256,10
+256,12
@@
public class AlignCalcManager implements AlignCalcManagerI
for (List<AlignCalcWorkerI> workers : updating.values())
{
for (AlignCalcWorkerI worker : workers)
for (List<AlignCalcWorkerI> workers : updating.values())
{
for (AlignCalcWorkerI worker : workers)
+ {
if (worker.involves(alignmentAnnotation))
{
return true;
}
if (worker.involves(alignmentAnnotation))
{
return true;
}
+ }
}
}
return false;
}
}
return false;
@@
-291,7
+293,7
@@
public class AlignCalcManager implements AlignCalcManagerI
AlignCalcWorkerI[] workers;
synchronized (canUpdate)
{
AlignCalcWorkerI[] workers;
synchronized (canUpdate)
{
- workers = canUpdate.toArray(new AlignCalcWorkerI[0]);
+ workers = canUpdate.toArray(new AlignCalcWorkerI[canUpdate.size()]);
}
for (AlignCalcWorkerI worker : workers)
{
}
for (AlignCalcWorkerI worker : workers)
{