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 update_212_Dec_merge_with_21125_chamges
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcManager2.java
diff --git
a/src/jalview/workers/AlignCalcManager2.java
b/src/jalview/workers/AlignCalcManager2.java
index
8d4796d
..
eba241a
100644
(file)
--- a/
src/jalview/workers/AlignCalcManager2.java
+++ b/
src/jalview/workers/AlignCalcManager2.java
@@
-23,6
+23,7
@@
import jalview.api.AlignCalcManagerI2;
import jalview.api.AlignCalcWorkerI;
import jalview.api.PollableAlignCalcWorkerI;
import jalview.bin.Cache;
import jalview.api.AlignCalcWorkerI;
import jalview.api.PollableAlignCalcWorkerI;
import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.AlignmentAnnotation;
public class AlignCalcManager2 implements AlignCalcManagerI2
import jalview.datamodel.AlignmentAnnotation;
public class AlignCalcManager2 implements AlignCalcManagerI2
@@
-105,23
+106,23
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
throw new IllegalStateException(
"Cannot submit new task if the prevoius one is still running");
}
throw new IllegalStateException(
"Cannot submit new task if the prevoius one is still running");
}
- Cache.log.debug(
+ Console.debug(
format("Worker %s queued", getWorker().getClass().getName()));
task = executor.submit(() -> {
try
{
format("Worker %s queued", getWorker().getClass().getName()));
task = executor.submit(() -> {
try
{
- Cache.log.debug(format("Worker %s started",
+ Console.debug(format("Worker %s started",
getWorker().getClass().getName()));
getWorker().run();
getWorker().getClass().getName()));
getWorker().run();
- Cache.log.debug(format("Worker %s finished",
+ Console.debug(format("Worker %s finished",
getWorker().getClass().getName()));
} catch (InterruptedException e)
{
getWorker().getClass().getName()));
} catch (InterruptedException e)
{
- Cache.log.debug(format("Worker %s interrupted",
+ Console.debug(format("Worker %s interrupted",
getWorker().getClass().getName()));
} catch (Throwable th)
{
getWorker().getClass().getName()));
} catch (Throwable th)
{
- Cache.log.debug(format("Worker %s failed",
+ Console.debug(format("Worker %s failed",
getWorker().getClass().getName()), th);
} finally
{
getWorker().getClass().getName()), th);
} finally
{
@@
-141,7
+142,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
{
return;
}
{
return;
}
- Cache.log.debug(format("Cancelling worker %s",
+ Console.debug(format("Cancelling worker %s",
getWorker().getClass().getName()));
task.cancel(true);
}
getWorker().getClass().getName()));
task.cancel(true);
}
@@
-175,7
+176,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
throw new IllegalStateException(
"Cannot submit new task if the prevoius one is still running");
}
throw new IllegalStateException(
"Cannot submit new task if the prevoius one is still running");
}
- Cache.log.debug(
+ Console.debug(
format("Worker %s queued", getWorker().getClass().getName()));
final var runnable = new Runnable()
{
format("Worker %s queued", getWorker().getClass().getName()));
final var runnable = new Runnable()
{
@@
-192,25
+193,25
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
{
if (!started)
{
{
if (!started)
{
- Cache.log.debug(format("Worker %s started",
+ Console.debug(format("Worker %s started",
getWorker().getClass().getName()));
getWorker().startUp();
started = true;
}
else if (!completed)
{
getWorker().getClass().getName()));
getWorker().startUp();
started = true;
}
else if (!completed)
{
- Cache.log.debug(format("Polling worker %s",
+ Console.debug(format("Polling worker %s",
getWorker().getClass().getName()));
if (getWorker().poll())
{
getWorker().getClass().getName()));
if (getWorker().poll())
{
- Cache.log.debug(format("Worker %s finished",
+ Console.debug(format("Worker %s finished",
getWorker().getClass().getName()));
completed = true;
}
}
} catch (Throwable th)
{
getWorker().getClass().getName()));
completed = true;
}
}
} catch (Throwable th)
{
- Cache.log.debug(format("Worker %s failed",
+ Console.debug(format("Worker %s failed",
getWorker().getClass().getName()), th);
completed = true;
}
getWorker().getClass().getName()), th);
completed = true;
}
@@
-219,7
+220,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
final var worker = getWorker();
if (!isRegistered())
PollableWorkerManager.super.worker = null;
final var worker = getWorker();
if (!isRegistered())
PollableWorkerManager.super.worker = null;
- Cache.log.debug(format("Finalizing completed worker %s",
+ Console.debug(format("Finalizing completed worker %s",
worker.getClass().getName()));
worker.done();
// almost impossible, but the future may be null at this point
worker.getClass().getName()));
worker.done();
// almost impossible, but the future may be null at this point
@@
-238,7
+239,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
{
return;
}
{
return;
}
- Cache.log.debug(format("Cancelling worker %s",
+ Console.debug(format("Cancelling worker %s",
getWorker().getClass().getName()));
task.cancel(false);
executor.submit(() -> {
getWorker().getClass().getName()));
task.cancel(false);
executor.submit(() -> {
@@
-248,7
+249,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
if (worker != null)
{
worker.cancel();
if (worker != null)
{
worker.cancel();
- Cache.log.debug(format("Finalizing cancelled worker %s",
+ Console.debug(format("Finalizing cancelled worker %s",
worker.getClass().getName()));
worker.done();
}
worker.getClass().getName()));
worker.done();
}
@@
-432,7
+433,7
@@
public class AlignCalcManager2 implements AlignCalcManagerI2
var manager = registered.get(worker);
if (manager == null)
{
var manager = registered.get(worker);
if (manager == null)
{
- Cache.log.warn("Starting unregistered worker " + worker);
+ Console.warn("Starting unregistered worker " + worker);
manager = createManager(worker);
oneshot.put(worker, manager);
}
manager = createManager(worker);
oneshot.put(worker, manager);
}