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 branch 'develop' into releases/Release_2_11_Branch
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcManager.java
diff --git
a/src/jalview/workers/AlignCalcManager.java
b/src/jalview/workers/AlignCalcManager.java
index
191e8c7
..
08ef3a2
100644
(file)
--- a/
src/jalview/workers/AlignCalcManager.java
+++ b/
src/jalview/workers/AlignCalcManager.java
@@
-68,12
+68,12
@@
public class AlignCalcManager implements AlignCalcManagerI
{
restartable = Collections
.synchronizedList(new ArrayList<AlignCalcWorkerI>());
{
restartable = Collections
.synchronizedList(new ArrayList<AlignCalcWorkerI>());
- blackList = Collections
- .synchronizedList(new ArrayList<Class<? extends AlignCalcWorkerI>>());
+ blackList = Collections.synchronizedList(
+ new ArrayList<Class<? extends AlignCalcWorkerI>>());
inProgress = Collections
.synchronizedList(new ArrayList<AlignCalcWorkerI>());
inProgress = Collections
.synchronizedList(new ArrayList<AlignCalcWorkerI>());
- updating = Collections
- .synchronizedMap(new Hashtable<Class<? extends AlignCalcWorkerI>, List<AlignCalcWorkerI>>());
+ updating = Collections.synchronizedMap(
+ new Hashtable<Class<? extends AlignCalcWorkerI>, List<AlignCalcWorkerI>>());
canUpdate = new HashSet<AlignCalcWorkerI>();
}
canUpdate = new HashSet<AlignCalcWorkerI>();
}
@@
-85,10
+85,8
@@
public class AlignCalcManager implements AlignCalcManagerI
List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
if (upd == null)
{
List<AlignCalcWorkerI> upd = updating.get(worker.getClass());
if (upd == null)
{
- updating.put(
- worker.getClass(),
- upd = Collections
- .synchronizedList(new ArrayList<AlignCalcWorkerI>()));
+ updating.put(worker.getClass(), upd = Collections
+ .synchronizedList(new ArrayList<AlignCalcWorkerI>()));
}
synchronized (upd)
{
}
synchronized (upd)
{
@@
-131,8
+129,7
@@
public class AlignCalcManager implements AlignCalcManagerI
{
if (inProgress.contains(worker))
{
{
if (inProgress.contains(worker))
{
- System.err.println("Implementation error: duplicate run of worker "
- + worker);
+ return false; // worker is already working, so ask caller to wait around
}
else
{
}
else
{
@@
-236,7
+233,8
@@
public class AlignCalcManager implements AlignCalcManagerI
}
@Override
}
@Override
- public boolean workingInvolvedWith(AlignmentAnnotation alignmentAnnotation)
+ public boolean workingInvolvedWith(
+ AlignmentAnnotation alignmentAnnotation)
{
synchronized (inProgress)
{
{
synchronized (inProgress)
{