/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * 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.
*
import jalview.datamodel.SequenceI;
import jalview.io.packed.DataProvider.JvDataType;
import jalview.util.StringUtils;
+import jalview.ws.api.UIinfo;
import jalview.ws.rest.params.Alignment;
import jalview.ws.rest.params.AnnotationFile;
import jalview.ws.rest.params.SeqGroupIndexVector;
boolean vseparable, char gapCharacter)
{
super();
- this.details = new UIinfo();
- details.Action = action == null ? "" : action;
- details.description = description == null ? "" : description;
- details.Name = name == null ? "" : name;
+ this.details = new UIinfo(action, action, name, description, postUrl);
this.postUrl = postUrl == null ? "" : postUrl;
this.urlSuffix = urlSuffix == null ? "" : urlSuffix;
if (inputParams != null)
boolean diff = (gapCharacter != other.gapCharacter);
diff |= vseparable != other.vseparable;
diff |= hseparable != other.hseparable;
- diff |= !(urlSuffix == null && other.urlSuffix == null || (urlSuffix != null
- && other.urlSuffix != null && urlSuffix.equals(other.urlSuffix)));
+ diff |= !(urlSuffix == null && other.urlSuffix == null
+ || (urlSuffix != null && other.urlSuffix != null
+ && urlSuffix.equals(other.urlSuffix)));
// TODO - robust diff that includes constants and reordering of URL
// diff |= !(postUrl.equals(other.postUrl));
// diff |= !inputParams.equals(other.inputParams);
- diff |= !details.Name.equals(other.details.Name);
- diff |= !details.Action.equals(other.details.Action);
- diff |= !details.description.equals(other.details.description);
+ diff |= !details.equals(other.details);
return !diff;
}
- /**
- * Service UI Info { Action, Specific Name of Service, Brief Description }
- */
-
- public class UIinfo
- {
- public String getAction()
- {
- return Action;
- }
-
- public void setAction(String action)
- {
- Action = action;
- }
-
- public String getName()
- {
- return Name;
- }
-
- public void setName(String name)
- {
- Name = name;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- String Action;
-
- String Name;
-
- String description;
- }
-
- public UIinfo details = new UIinfo();
+ public UIinfo details;
public String getAction()
{
/**
* input info given as key/value pairs - mapped to post arguments
*/
- Map<String, InputType> inputParams = new HashMap<String, InputType>();
+ Map<String, InputType> inputParams = new HashMap<>();
/**
* assigns the given inputType it to its corresponding input parameter token
}
StringTokenizer st = new StringTokenizer(outstring, ";");
String tok = "";
- resultData = new ArrayList<JvDataType>();
+ resultData = new ArrayList<>();
while (st.hasMoreTokens())
{
try
resultData.add(JvDataType.valueOf(tok = st.nextToken()));
} catch (NoSuchElementException x)
{
- warnings.append("Invalid result type: '" + tok
- + "' (must be one of: ");
+ warnings.append(
+ "Invalid result type: '" + tok + "' (must be one of: ");
String sep = "";
for (JvDataType vl : JvDataType.values())
{
private String getServiceIOProperties()
{
- ArrayList<String> vls = new ArrayList<String>();
+ ArrayList<String> vls = new ArrayList<>();
if (isHseparable())
{
vls.add("hseparable");
;
vls.add(new String("gapCharacter='" + gapCharacter + "'"));
vls.add(new String("returns='" + _genOutputFormatString() + "'"));
- return StringUtils
- .arrayToSeparatorList(vls.toArray(new String[0]), ",");
+ return StringUtils.arrayToSeparatorList(vls.toArray(new String[0]),
+ ",");
}
+ @Override
public String toString()
{
StringBuffer result = new StringBuffer();
result.append("|");
- result.append(details.Name);
+ result.append(details.getName());
result.append('|');
- result.append(details.Action);
+ result.append(details.getAction());
result.append('|');
- if (details.description != null)
+ if (details.getDescription() != null)
{
- result.append(details.description);
+ result.append(details.getDescription());
}
;
// list job input flags
* @param p
* @return
*/
- protected int parseServiceList(String[] list, StringBuffer warnings, int p)
+ protected int parseServiceList(String[] list, StringBuffer warnings,
+ int p)
{
boolean invalid = false;
// look for the first non-empty position - expect it to be service name
{
p++;
}
- details.Name = list[p];
- details.Action = list[p + 1];
- details.description = list[p + 2];
+ details = new UIinfo(list[p + 1], list[p + 1], list[p], list[p + 2],
+ postUrl);
invalid |= !configureFromServiceInputProperties(list[p + 3], warnings);
if (list.length - p > 5 && list[p + 5] != null
&& list[p + 5].trim().length() > 5)
&& list[p + 4].trim().length() > 5)
{
urlSuffix = null;
- invalid |= !configureFromInputParamEncodedUrl(list[p + 4], warnings);
+ invalid |= !configureFromInputParamEncodedUrl(list[p + 4],
+ warnings);
p += 5;
}
}
int lastp = 0;
String url = new String();
Matcher prms = PARAM_ENCODED_URL_PATTERN.matcher(ipurl);
- Map<String, InputType> iparams = new Hashtable<String, InputType>();
+ Map<String, InputType> iparams = new Hashtable<>();
InputType jinput;
while (prms.find())
{
iprmparams = iprm.substring(colon + 1);
iprm = iprm.substring(0, colon);
}
- valid = parseTypeString(prms.group(0), tok, iprm, iprmparams,
- iparams, warnings);
+ valid = parseTypeString(prms.group(0), tok, iprm, iprmparams, iparams,
+ warnings);
}
if (valid)
{
// TODO - find a better way of maintaining this classlist
return new Class[] { jalview.ws.rest.params.Alignment.class,
jalview.ws.rest.params.AnnotationFile.class,
- SeqGroupIndexVector.class,
- jalview.ws.rest.params.SeqIdVector.class,
+ SeqGroupIndexVector.class, jalview.ws.rest.params.SeqIdVector.class,
jalview.ws.rest.params.SeqVector.class,
jalview.ws.rest.params.Tree.class };
}
jinput = (InputType) (type.getConstructor().newInstance());
if (iprm.equalsIgnoreCase(jinput.getURLtokenPrefix()))
{
- ArrayList<String> al = new ArrayList<String>();
+ ArrayList<String> al = new ArrayList<>();
for (String prprm : StringUtils.separatorListToArray(iprmparams,
","))
{
/**
* search the input types for an instance of the given class
*
- * @param <validInput.inputType> class1
+ * @param <validInput.inputType>
+ * class1
* @return
*/
public boolean inputInvolves(Class<?> class1)
return jobId + urlSuffix;
}
- private List<JvDataType> resultData = new ArrayList<JvDataType>();
+ private List<JvDataType> resultData = new ArrayList<>();
/**
*
{
if (resultData == null)
{
- resultData = new ArrayList<JvDataType>();
+ resultData = new ArrayList<>();
}
resultData.add(dt);
}
String services) throws Exception
{
String[] list = StringUtils.separatorListToArray(services, "|");
- List<RestServiceDescription> svcparsed = new ArrayList<RestServiceDescription>();
+ List<RestServiceDescription> svcparsed = new ArrayList<>();
int p = 0, lastp = 0;
StringBuffer warnings = new StringBuffer();
do
git://source.jalview.org / jalview.git / blobdiff