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-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
dm
/
AAConSettings.java
diff --git
a/src/jalview/ws/jws2/dm/AAConSettings.java
b/src/jalview/ws/jws2/dm/AAConSettings.java
index
285b755
..
997913e
100644
(file)
--- a/
src/jalview/ws/jws2/dm/AAConSettings.java
+++ b/
src/jalview/ws/jws2/dm/AAConSettings.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
- * Copyright (C) 2015 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-21,6
+21,7
@@
package jalview.ws.jws2.dm;
import jalview.util.MessageManager;
package jalview.ws.jws2.dm;
import jalview.util.MessageManager;
+import jalview.ws.api.ServiceWithParameters;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.ParameterUtils;
import jalview.ws.jws2.JabaParamStore;
import jalview.ws.jws2.JabaPreset;
import jalview.ws.jws2.ParameterUtils;
@@
-42,16
+43,16
@@
import compbio.metadata.Option;
*/
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
{
*/
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
{
- Jws2Instance service;
+ ServiceWithParameters service;
- public AAConSettings(boolean autoUpdate, Jws2Instance service,
+ public AAConSettings(boolean autoUpdate, ServiceWithParameters service2,
WsParamSetI preset, List<ArgumentI> jobArgset)
{
super(preset, jobArgset, autoUpdate);
WsParamSetI preset, List<ArgumentI> jobArgset)
{
super(preset, jobArgset, autoUpdate);
- this.service = service;
+ this.service = service2;
}
}
- public Jws2Instance getService()
+ public ServiceWithParameters getService()
{
return service;
}
{
return service;
}
@@
-76,7
+77,8
@@
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
preset = pr;
return;
}
preset = pr;
return;
}
- List<ArgumentI> oldargs = new ArrayList<ArgumentI>(), newargs = new ArrayList<ArgumentI>();
+ List<ArgumentI> oldargs = new ArrayList<>(),
+ newargs = new ArrayList<>();
oldargs.addAll(preset.getArguments());
// need to compare parameters
for (ArgumentI newparg : pr.getArguments())
oldargs.addAll(preset.getArguments());
// need to compare parameters
for (ArgumentI newparg : pr.getArguments())
@@
-93,25
+95,25
@@
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
return;
}
// Try even harder to migrate arguments.
return;
}
// Try even harder to migrate arguments.
- throw new Error(
- MessageManager
- .getString("error.parameter_migration_not_implemented_yet"));
+ throw new Error(MessageManager
+ .getString("error.parameter_migration_not_implemented_yet"));
}
}
public List<Argument> getJobArgset()
{
}
}
public List<Argument> getJobArgset()
{
- return jobArgset == null ? null : JabaParamStore
- .getJabafromJwsArgs(jobArgset);
+ return jobArgset == null ? null
+ : JabaParamStore.getJabafromJwsArgs(jobArgset);
}
public void setJobArgset(List<Argument> jobArgset)
{
// TODO: test if parameters valid for service
}
public void setJobArgset(List<Argument> jobArgset)
{
// TODO: test if parameters valid for service
- this.jobArgset = jobArgset == null ? null : JabaParamStore
- .getJwsArgsfromJaba(jobArgset);
+ this.jobArgset = jobArgset == null ? null
+ : JabaParamStore.getJwsArgsfromJaba(jobArgset);
}
}
+ @Override
public String getWsParamFile()
{
List<Option> opts = null;
public String getWsParamFile()
{
List<Option> opts = null;
@@
-142,7
+144,7
@@
public class AAConSettings extends jalview.ws.params.AutoCalcSetting
@Override
public String getServiceURI()
{
@Override
public String getServiceURI()
{
- return service.getServiceTypeURI();
+ return service.getNameURI();
}
@Override
}
@Override