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-3692 refactor/complete parsing, more unit test coverage
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
AbstractJabaCalcWorker.java
diff --git
a/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
b/src/jalview/ws/jws2/AbstractJabaCalcWorker.java
index
26fe0a2
..
dd64e77
100644
(file)
--- a/
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
+++ b/
src/jalview/ws/jws2/AbstractJabaCalcWorker.java
@@
-30,6
+30,7
@@
import jalview.datamodel.AnnotatedCollectionI;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.IProgressIndicator;
import jalview.datamodel.SequenceI;
import jalview.gui.AlignFrame;
import jalview.gui.IProgressIndicator;
+import jalview.gui.IProgressIndicatorHandler;
import jalview.schemes.ResidueProperties;
import jalview.workers.AlignCalcWorker;
import jalview.ws.jws2.dm.AAConSettings;
import jalview.schemes.ResidueProperties;
import jalview.workers.AlignCalcWorker;
import jalview.ws.jws2.dm.AAConSettings;
@@
-220,7
+221,26
@@
public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
progressId = System.currentTimeMillis());
}
rslt = submitToService(seqs);
progressId = System.currentTimeMillis());
}
rslt = submitToService(seqs);
+ if (guiProgress != null)
+ {
+ guiProgress.registerHandler(progressId,
+ new IProgressIndicatorHandler()
+ {
+ @Override
+ public boolean cancelActivity(long id)
+ {
+ cancelCurrentJob();
+ return true;
+ }
+
+ @Override
+ public boolean canCancel()
+ {
+ return true;
+ }
+ });
+ }
boolean finished = false;
long rpos = 0;
do
boolean finished = false;
long rpos = 0;
do
@@
-372,7
+392,8
@@
public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
{
guiProgress.setProgressBar("", progressId);
}
{
guiProgress.setProgressBar("", progressId);
}
- ap.paintAlignment(true);
+ // TODO: may not need to paintAlignment again !
+ ap.paintAlignment(false, false);
}
if (msg.length() > 0)
{
}
if (msg.length() > 0)
{
@@
-582,7
+603,7
@@
public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
protected boolean checkDone()
{
calcMan.notifyStart(this);
protected boolean checkDone()
{
calcMan.notifyStart(this);
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
while (!calcMan.notifyWorking(this))
{
if (calcMan.isWorking(this))
while (!calcMan.notifyWorking(this))
{
if (calcMan.isWorking(this))
@@
-593,7
+614,7
@@
public abstract class AbstractJabaCalcWorker extends AlignCalcWorker
{
if (ap != null)
{
{
if (ap != null)
{
- ap.paintAlignment(false);
+ ap.paintAlignment(false, false);
}
Thread.sleep(200);
}
Thread.sleep(200);