git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6fbc6eb
)
distinguish between userdefined parameter set job and preset job
author
jprocter
<Jim Procter>
Fri, 3 Sep 2010 08:19:39 +0000
(08:19 +0000)
committer
jprocter
<Jim Procter>
Fri, 3 Sep 2010 08:19:39 +0000
(08:19 +0000)
src/jalview/ws/jws2/MsaWSClient.java
patch
|
blob
|
history
diff --git
a/src/jalview/ws/jws2/MsaWSClient.java
b/src/jalview/ws/jws2/MsaWSClient.java
index
1d9a89c
..
820dfb4
100644
(file)
--- a/
src/jalview/ws/jws2/MsaWSClient.java
+++ b/
src/jalview/ws/jws2/MsaWSClient.java
@@
-117,8
+117,12
@@
public class MsaWSClient extends Jws2Client
{
return;
}
- preset = null;
- paramset = jobParams.getJobParams();
+ if ((this.preset = jobParams.getPreset())==null)
+ {
+ paramset = jobParams.getJobParams();
+ } else {
+ paramset = null; // no user supplied parameters.
+ }
}
if ((wsInfo = setWebService(sh, false)) == null)