/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
- * Copyright (C) 2014 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.gui.Desktop;
import jalview.gui.WebserviceInfo;
import jalview.io.packed.DataProvider.JvDataType;
+import jalview.io.packed.JalviewDataset;
import jalview.util.MessageManager;
import jalview.ws.WSClient;
import jalview.ws.WSClientI;
import jalview.ws.WSMenuEntryProviderI;
+import jalview.ws.rest.params.Alignment;
+import jalview.ws.rest.params.JobConstant;
+import jalview.ws.rest.params.SeqGroupIndexVector;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
*/
protected AlignFrame recoverAlignFrameForView()
{
- return jalview.gui.Desktop.getAlignFrameFor(av);
+ return Desktop.getAlignFrameFor(av);
}
public RestClient(RestServiceDescription service2, AlignFrame alignFrame)
if (!headless)
{
wsInfo = new WebserviceInfo(WebServiceJobTitle, WebServiceName + "\n"
- + WebServiceReference);
+ + WebServiceReference, true);
wsInfo.setRenderAsHtml(true);
}
/**
* input data context
*/
- jalview.io.packed.JalviewDataset jds;
+ JalviewDataset jds;
/**
* informative name for results
{
String action = "Analysis", description = "Sequence Harmony and Multi-Relief (Brandt et al. 2010)", name = MessageManager.getString("label.multiharmony");
Hashtable<String, InputType> iparams = new Hashtable<String, InputType>();
- jalview.ws.rest.params.JobConstant toolp;
+ JobConstant toolp;
// toolp = new jalview.ws.rest.JobConstant("tool","jalview");
// iparams.put(toolp.token, toolp);
// toolp = new jalview.ws.rest.params.JobConstant("mbjob[method]","shmr");
// toolp = new jalview.ws.rest.params.JobConstant("blast","0");
// iparams.put(toolp.token, toolp);
- jalview.ws.rest.params.Alignment aliinput = new jalview.ws.rest.params.Alignment();
+ Alignment aliinput = new Alignment();
// SHMR server has a 65K limit for content pasted into the 'ali' parameter,
// so we always upload our files.
aliinput.token = "ali_file";
aliinput.writeAsFile = true;
iparams.put(aliinput.token, aliinput);
- jalview.ws.rest.params.SeqGroupIndexVector sgroups = new jalview.ws.rest.params.SeqGroupIndexVector();
+ SeqGroupIndexVector sgroups = new SeqGroupIndexVector();
sgroups.setMinsize(2);
sgroups.min = 2;// need at least two group defined to make a partition
iparams.put("groups", sgroups);
try
{
for (RestServiceDescription descr : RestServiceDescription
- .parseDescriptions(jalview.bin.Cache.getDefault(
+ .parseDescriptions(Cache.getDefault(
RSBS_SERVICES,
makeShmmrRestClient().service.toString())))
{
return lst;
}
- public static void main(String args[])
- {
- try
- {
- RestClient[] clients = getRestClients();
- System.out.println("Got " + clients.length + " clients.");
- int i = 0;
- Vector<String> urls = new Vector<String>();
- for (RestClient cl : clients)
- {
- System.out.println("" + (++i) + ": " + cl.service.toString());
- urls.add(cl.service.toString());
- }
- setRsbsServices(urls);
- if (clients.length != getRestClients().length)
- {
- System.err
- .println("Failed. Differing numbers of clients when stringified and parsed again.");
- }
-
- } catch (Throwable x)
- {
- System.err.println("Failed. Unexpected exception.");
- x.printStackTrace();
- }
- }
-
public String getAction()
{
return service.details.Action;