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 features/JAL-2446NCList
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
JWs2Job.java
diff --git
a/src/jalview/ws/jws2/JWs2Job.java
b/src/jalview/ws/jws2/JWs2Job.java
index
9482d1d
..
cd85d4a
100644
(file)
--- a/
src/jalview/ws/jws2/JWs2Job.java
+++ b/
src/jalview/ws/jws2/JWs2Job.java
@@
-128,8
+128,9
@@
public abstract class JWs2Job extends AWsJob
@Override
public boolean isQueued()
{
@Override
public boolean isQueued()
{
- return status == null ? false : status.equals(status.SUBMITTED)
- || status.equals(status.PENDING);
+ return status == null ? false
+ : status.equals(status.SUBMITTED)
+ || status.equals(status.PENDING);
}
/*
}
/*
@@
-141,9
+142,8
@@
public abstract class JWs2Job extends AWsJob
public boolean isRunning()
{
// TODO Auto-generated method stub
public boolean isRunning()
{
// TODO Auto-generated method stub
- return status != null
- && (status.equals(status.RUNNING) || status
- .equals(status.STARTED));
+ return status != null && (status.equals(status.RUNNING)
+ || status.equals(status.STARTED));
}
/*
}
/*