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-244 Fix window size narrow adjustment not becoming a manual adjustment clash
[jalview.git]
/
src
/
jalview
/
ws
/
jws1
/
MsaWSThread.java
diff --git
a/src/jalview/ws/jws1/MsaWSThread.java
b/src/jalview/ws/jws1/MsaWSThread.java
index
006f014
..
e027038
100644
(file)
--- a/
src/jalview/ws/jws1/MsaWSThread.java
+++ b/
src/jalview/ws/jws1/MsaWSThread.java
@@
-21,7
+21,7
@@
package jalview.ws.jws1;
import jalview.analysis.AlignSeq;
package jalview.ws.jws1;
import jalview.analysis.AlignSeq;
-import jalview.bin.Cache;
+import jalview.bin.Console;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentOrder;
import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.AlignmentOrder;
@@
-410,7
+410,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
{
cancelledMessage += ("\nProblems cancelling the job : Exception received...\n"
+ exc + "\n");
{
cancelledMessage += ("\nProblems cancelling the job : Exception received...\n"
+ exc + "\n");
- Cache.log.warn(
+ Console.warn(
"Exception whilst cancelling " + jobs[job].getJobId(),
exc);
}
"Exception whilst cancelling " + jobs[job].getJobId(),
exc);
}
@@
-453,9
+453,9
@@
class MsaWSThread extends JWS1Thread implements WSClientI
MsaWSJob j = (MsaWSJob) job;
if (j.isSubmitted())
{
MsaWSJob j = (MsaWSJob) job;
if (j.isSubmitted())
{
- if (Cache.log.isDebugEnabled())
+ if (Console.isDebugEnabled())
{
{
- Cache.log.debug(
+ Console.debug(
"Tried to submit an already submitted job " + j.getJobId());
}
return;
"Tried to submit an already submitted job " + j.getJobId());
}
return;
@@
-542,7
+542,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
&& jobs[j].hasResults())
{
results++;
&& jobs[j].hasResults())
{
results++;
- // if (Cache.log.isDebugEnabled())
+ // if (Cache.isDebugEnabled())
// {
// System.out.println("Job lob for job
// "+jobs[j].getJobId()+":"+jobs[j].getJobnum());
// {
// System.out.println("Job lob for job
// "+jobs[j].getJobId()+":"+jobs[j].getJobnum());
@@
-571,7
+571,7
@@
class MsaWSThread extends JWS1Thread implements WSClientI
} catch (Exception ex)
{
} catch (Exception ex)
{
- Cache.log.error(
+ Console.error(
"Unexpected exception when processing results for " + alTitle,
ex);
wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);
"Unexpected exception when processing results for " + alTitle,
ex);
wsInfo.setStatus(WebserviceInfo.STATE_STOPPED_ERROR);