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
{
return;
}
- if (!isRestartable())
+ if (!isRegistered())
{
setEnabled(false);
}
submit();
}
- protected boolean isRestartable()
+ protected boolean isRegistered()
{
return registered.containsKey(getWorker());
}
throw new IllegalStateException(
"Cannot submit new task if the prevoius one is still running");
}
- Cache.log.debug(
- format("Worker %s queued", getWorker().getClass().getName()));
+ Console.debug(
+ format("Worker %s queued", getWorker()));
task = executor.submit(() -> {
try
{
- Cache.log.debug(format("Worker %s started",
- getWorker().getClass().getName()));
+ Console.debug(format("Worker %s started", getWorker()));
getWorker().run();
- Cache.log.debug(format("Worker %s finished",
- getWorker().getClass().getName()));
+ Console.debug(format("Worker %s finished", getWorker()));
} catch (InterruptedException e)
{
- Cache.log.debug(format("Worker %s interrupted",
- getWorker().getClass().getName()));
+ Console.debug(format("Worker %s interrupted", getWorker()));
} catch (Throwable th)
{
- Cache.log.debug(format("Worker %s failed",
- getWorker().getClass().getName()), th);
+ Console.debug(format("Worker %s failed", getWorker()), th);
} finally
{
- if (!isRestartable())
+ if (!isRegistered())
{
// delete worker reference so garbage collector can remove it
worker = null;
{
return;
}
- Cache.log.debug(format("Cancelling worker %s",
- getWorker().getClass().getName()));
+ Console.debug(format("Cancelling worker %s", getWorker()));
task.cancel(true);
}
}
if (task != null && !(task.isDone() || task.isCancelled()))
{
throw new IllegalStateException(
- "Cannot submit new task if the prevoius one is still running");
+ "Cannot submit new task if the previous one is still running");
}
- Cache.log.debug(
- format("Worker %s queued", getWorker().getClass().getName()));
+ Console.debug( format("Worker %s queued", getWorker()));
final var runnable = new Runnable()
{
private boolean started = false;
{
if (!started)
{
- Cache.log.debug(format("Worker %s started",
- getWorker().getClass().getName()));
+ Console.debug(format("Worker %s started", getWorker()));
getWorker().startUp();
started = true;
}
else if (!completed)
{
- Cache.log.debug(format("Polling worker %s",
- getWorker().getClass().getName()));
+ Console.debug(format("Polling worker %s", getWorker()));
if (getWorker().poll())
{
- Cache.log.debug(format("Worker %s finished",
- getWorker().getClass().getName()));
+ Console.debug(format("Worker %s finished", getWorker()));
completed = true;
}
}
} catch (Throwable th)
{
- Cache.log.debug(format("Worker %s failed",
- getWorker().getClass().getName()), th);
+ Console.debug(format("Worker %s failed", getWorker()), th);
completed = true;
}
if (completed)
{
final var worker = getWorker();
- if (!isRestartable())
+ if (!isRegistered())
PollableWorkerManager.super.worker = null;
- Cache.log.debug(format("Finalizing completed worker %s",
- worker.getClass().getName()));
+ Console.debug(format("Finalizing completed worker %s", worker));
worker.done();
// almost impossible, but the future may be null at this point
// let it throw NPE to cancel forcefully
{
return;
}
- Cache.log.debug(format("Cancelling worker %s",
- getWorker().getClass().getName()));
+ Console.debug(format("Cancelling worker %s", getWorker()));
task.cancel(false);
executor.submit(() -> {
final var worker = getWorker();
- if (!isRestartable())
+ if (!isRegistered())
PollableWorkerManager.super.worker = null;
if (worker != null)
{
worker.cancel();
- Cache.log.debug(format("Finalizing cancelled worker %s",
- worker.getClass().getName()));
+ Console.debug(format("Finalizing cancelled worker %s", worker));
worker.done();
}
});
{
for (var worker : getWorkers())
{
- if (worker.involves(annot) && worker.isDeletable())
+ if (worker.involves(annot))
{
removeWorker(worker);
}
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);
}