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-4199 Fix cancel button not appearing on progress bar
[jalview.git]
/
src
/
jalview
/
ws
/
jws2
/
JabaParamStore.java
diff --git
a/src/jalview/ws/jws2/JabaParamStore.java
b/src/jalview/ws/jws2/JabaParamStore.java
index
5e034cd
..
929c5e2
100644
(file)
--- a/
src/jalview/ws/jws2/JabaParamStore.java
+++ b/
src/jalview/ws/jws2/JabaParamStore.java
@@
-47,7
+47,7
@@
import compbio.metadata.RunnerConfig;
public class JabaParamStore implements ParamDatastoreI
{
public class JabaParamStore implements ParamDatastoreI
{
- Hashtable<String, JabaWsParamSet> editedParams = new Hashtable<String, JabaWsParamSet>();
+ Hashtable<String, JabaWsParamSet> editedParams = new Hashtable<>();
private Jws2Instance service;
private Jws2Instance service;
@@
-101,7
+101,7
@@
public class JabaParamStore implements ParamDatastoreI
List<WsParamSetI> prefs = new ArrayList<>();
if (servicePresets == null)
{
List<WsParamSetI> prefs = new ArrayList<>();
if (servicePresets == null)
{
- servicePresets = new Hashtable<String, JabaPreset>();
+ servicePresets = new Hashtable<>();
PresetManager prman;
if ((prman = service.getPresets()) != null)
{
PresetManager prman;
if ((prman = service.getPresets()) != null)
{
@@
-148,8
+148,8
@@
public class JabaParamStore implements ParamDatastoreI
public static List<ArgumentI> getJwsArgsfromJaba(List jabargs,
boolean sortByOpt)
{
public static List<ArgumentI> getJwsArgsfromJaba(List jabargs,
boolean sortByOpt)
{
- List<ArgumentI> rgs = new ArrayList<ArgumentI>();
- List<String> rgnames = new ArrayList<String>();
+ List<ArgumentI> rgs = new ArrayList<>();
+ List<String> rgnames = new ArrayList<>();
for (Object rg : jabargs)
{
ArgumentI narg = null;
for (Object rg : jabargs)
{
ArgumentI narg = null;
@@
-309,7
+309,7
@@
public class JabaParamStore implements ParamDatastoreI
boolean found = false;
for (String url : urls)
{
boolean found = false;
for (String url : urls)
{
- if (service.getServiceTypeURI().equals(url)
+ if (service.getNameURI().equals(url)
|| service.getUri().equalsIgnoreCase(url))
{
found = true;
|| service.getUri().equalsIgnoreCase(url))
{
found = true;
@@
-334,7
+334,7
@@
public class JabaParamStore implements ParamDatastoreI
wsp.setDescription(descr);
wsp.setApplicableUrls(urls.clone());
wsp.setDescription(descr);
wsp.setApplicableUrls(urls.clone());
- List<String> lines = new ArrayList<String>();
+ List<String> lines = new ArrayList<>();
StringTokenizer st = new StringTokenizer(parameterfile, "\n");
while (st.hasMoreTokens())
{
StringTokenizer st = new StringTokenizer(parameterfile, "\n");
while (st.hasMoreTokens())
{