{
try
{
- Cache.log
- .debug("Waiting around for old discovery thread to finish.");
+ Cache.debug(
+ "Waiting around for old discovery thread to finish.");
// wait around until old discoverer dies
Thread.sleep(100);
} catch (Exception e)
}
}
aborted = false;
- Cache.log.debug("Old discovery thread has finished.");
+ Cache.debug("Old discovery thread has finished.");
}
running = true;
// first set up exclusion list if needed
- final Set<String> ignoredServices = new HashSet<String>();
- for (String ignored : Cache.getDefault("IGNORED_JABAWS_SERVICETYPES",
- "").split("\\|"))
+ final Set<String> ignoredServices = new HashSet<>();
+ for (String ignored : Cache
+ .getDefault("IGNORED_JABAWS_SERVICETYPES", "").split("\\|"))
{
ignoredServices.add(ignored);
}
oldthread = Thread.currentThread();
try
{
- Class foo = getClass().getClassLoader().loadClass(
- "compbio.ws.client.Jws2Client");
+ Class foo = getClass().getClassLoader()
+ .loadClass("compbio.ws.client.Jws2Client");
} catch (ClassNotFoundException e)
{
- System.err
- .println("Not enabling JABA Webservices : client jar is not available."
+ System.err.println(
+ "Not enabling JABA Webservices : client jar is not available."
+ "\nPlease check that your webstart JNLP file is up to date!");
running = false;
return;
{
validServiceUrls.removeAllElements();
}
- ArrayList<String> svctypes = new ArrayList<String>();
+ ArrayList<String> svctypes = new ArrayList<>();
- List<JabaWsServerQuery> qrys = new ArrayList<JabaWsServerQuery>();
+ List<JabaWsServerQuery> qrys = new ArrayList<>();
for (final String jwsserver : getServiceUrls())
{
JabaWsServerQuery squery = new JabaWsServerQuery(this, jwsserver);
} catch (Exception e)
{
}
- ;
for (JabaWsServerQuery squery : qrys)
{
if (squery.isRunning())
}
if (aborted)
{
- Cache.log.debug("Aborting " + qrys.size()
- + " JABAWS discovery threads.");
+ Cache.debug(
+ "Aborting " + qrys.size() + " JABAWS discovery threads.");
for (JabaWsServerQuery squery : qrys)
{
squery.setQuit(true);
+ svctypes.indexOf(svc.serviceType);
}
jalview.util.QuickSort.sort(spos, svcs);
- services = new Vector<Jws2Instance>();
+ services = new Vector<>();
for (Jws2Instance svc : svcs)
{
if (!ignoredServices.contains(svc.serviceType))
}
oldthread = null;
running = false;
- changeSupport.firePropertyChange("services",
- new Vector<Jws2Instance>(), services);
+ changeSupport.firePropertyChange("services", new Vector<Jws2Instance>(),
+ services);
}
/**
{
if (services == null)
{
- services = new Vector<Jws2Instance>();
+ services = new Vector<>();
}
- System.out.println("Discovered service: " + jwsservers + " "
- + service.toString());
+ System.out.println(
+ "Discovered service: " + jwsservers + " " + service.toString());
// Jws2Instance service = new Jws2Instance(jwsservers, srv.toString(),
// service2);
service.hasParameters();
if (validServiceUrls == null)
{
- validServiceUrls = new Vector<String>();
+ validServiceUrls = new Vector<>();
}
validServiceUrls.add(jwsservers);
}
* for moment we keep them separate.
*/
JMenu atpoint;
- List<Jws2Instance> enumerableServices = new ArrayList<Jws2Instance>();
+ List<Jws2Instance> enumerableServices = new ArrayList<>();
// jws2al.removeAll();
- Map<String, Jws2Instance> preferredHosts = new HashMap<String, Jws2Instance>();
- Map<String, List<Jws2Instance>> alternates = new HashMap<String, List<Jws2Instance>>();
+ Map<String, Jws2Instance> preferredHosts = new HashMap<>();
+ Map<String, List<Jws2Instance>> alternates = new HashMap<>();
for (Jws2Instance service : services.toArray(new Jws2Instance[0]))
{
if (!isRecalculable(service.action))
{
if (ph == null)
{
- ph = new ArrayList<Jws2Instance>();
+ ph = new ArrayList<>();
}
ph.add(service);
alternates.put(service.serviceType, ph);
service.attachWSMenuEntry(atpoint, alignFrame);
if (alternates.containsKey(service.serviceType))
{
- atpoint.add(hitm = new JMenu(MessageManager
- .getString("label.switch_server")));
+ atpoint.add(hitm = new JMenu(
+ MessageManager.getString("label.switch_server")));
hitm.setToolTipText(JvSwingUtils.wrapTooltip(false,
MessageManager.getString("label.choose_jabaws_server")));
for (final Jws2Instance sv : alternates.get(service.serviceType))
sv.action, sv);
changeSupport.firePropertyChange("services",
new Vector<Jws2Instance>(), services);
- };
+ }
}).start();
}
* submenus to index by host and service program type
*/
private void addEnumeratedServices(final JMenu jws2al,
- final AlignFrame alignFrame, List<Jws2Instance> enumerableServices)
+ final AlignFrame alignFrame,
+ List<Jws2Instance> enumerableServices)
{
- boolean byhost = Cache.getDefault("WSMENU_BYHOST", false), bytype = Cache
- .getDefault("WSMENU_BYTYPE", false);
+ boolean byhost = Cache.getDefault("WSMENU_BYHOST", false),
+ bytype = Cache.getDefault("WSMENU_BYTYPE", false);
/**
* eventually, JWS2 services will appear under the same align/etc submenus.
* for moment we keep them separate.
*/
JMenu atpoint;
- List<String> hostLabels = new ArrayList<String>();
- Hashtable<String, String> lasthostFor = new Hashtable<String, String>();
- Hashtable<String, ArrayList<Jws2Instance>> hosts = new Hashtable<String, ArrayList<Jws2Instance>>();
- ArrayList<String> hostlist = new ArrayList<String>();
+ List<String> hostLabels = new ArrayList<>();
+ Hashtable<String, String> lasthostFor = new Hashtable<>();
+ Hashtable<String, ArrayList<Jws2Instance>> hosts = new Hashtable<>();
+ ArrayList<String> hostlist = new ArrayList<>();
for (Jws2Instance service : enumerableServices)
{
ArrayList<Jws2Instance> hostservices = hosts.get(service.getHost());
if (hostservices == null)
{
hosts.put(service.getHost(),
- hostservices = new ArrayList<Jws2Instance>());
+ hostservices = new ArrayList<>());
hostlist.add(service.getHost());
}
hostservices.add(service);
// now add hosts in order of the given array
for (String host : hostlist)
{
- Jws2Instance orderedsvcs[] = hosts.get(host).toArray(
- new Jws2Instance[1]);
+ Jws2Instance orderedsvcs[] = hosts.get(host)
+ .toArray(new Jws2Instance[1]);
String sortbytype[] = new String[orderedsvcs.length];
for (int i = 0; i < sortbytype.length; i++)
{
atpoint = JvSwingUtils.findOrCreateMenu(atpoint, host);
if (atpoint.getToolTipText() == null)
{
- atpoint.setToolTipText(MessageManager.formatMessage(
- "label.services_at", new String[] { host }));
+ atpoint.setToolTipText(MessageManager
+ .formatMessage("label.services_at", new String[]
+ { host }));
}
}
if (bytype)
atpoint.setToolTipText(service.getActionText());
}
}
- if (!byhost
- && !hostLabels.contains(host + service.serviceType
- + service.getActionText()))
+ if (!byhost && !hostLabels.contains(
+ host + service.serviceType + service.getActionText()))
// !hostLabels.contains(host + (bytype ?
// service.serviceType+service.getActionText() : "")))
{
Desktop.showUrl(service.getHost());
}
});
- hitm.setToolTipText(JvSwingUtils.wrapTooltip(true,
- MessageManager.getString("label.open_jabaws_web_page")));
+ hitm.setToolTipText(
+ JvSwingUtils.wrapTooltip(true, MessageManager
+ .getString("label.open_jabaws_web_page")));
lasthostFor.put(service.action, host);
}
- hostLabels.add(host + service.serviceType
- + service.getActionText());
+ hostLabels.add(
+ host + service.serviceType + service.getActionText());
}
service.attachWSMenuEntry(atpoint, alignFrame);
}
}
+ /**
+ *
+ * @param args
+ * @j2sIgnore
+ */
public static void main(String[] args)
{
if (args.length > 0)
{
- testUrls = new ArrayList<String>();
+ testUrls = new ArrayList<>();
for (String url : args)
{
testUrls.add(url);
}
- ;
}
- Thread runner = getDiscoverer().startDiscoverer(
- new PropertyChangeListener()
+ Thread runner = getDiscoverer()
+ .startDiscoverer(new PropertyChangeListener()
{
@Override
for (Jws2Instance instance : getDiscoverer().services)
{
System.out.println("Service " + i++ + " "
- + instance.getClass() + "@"
- + instance.getHost() + ": "
- + instance.getActionText());
+ + instance.getClass() + "@" + instance.getHost()
+ + ": " + instance.getActionText());
}
}
} catch (InterruptedException e)
{
}
- ;
}
try
{
// return test urls, if there are any, instead of touching cache
return testUrls;
}
- List<String> urls = new ArrayList<String>();
+ List<String> urls = new ArrayList<>();
if (this.preferredUrl != null)
{
}
else
{
- Cache.log.warn("Ignoring duplicate url " + url + " in "
+ Cache.warn("Ignoring duplicate url " + url + " in "
+ JWS2HOSTURLS + " list");
}
} catch (MalformedURLException ex)
{
- Cache.log.warn("Problem whilst trying to make a URL from '"
+ Cache.warn("Problem whilst trying to make a URL from '"
+ ((url != null) ? url : "<null>") + "'");
- Cache.log
- .warn("This was probably due to a malformed comma separated list"
- + " in the "
- + JWS2HOSTURLS
+ Cache.warn(
+ "This was probably due to a malformed comma separated list"
+ + " in the " + JWS2HOSTURLS
+ " entry of $(HOME)/.jalview_properties)");
- Cache.log.debug("Exception was ", ex);
+ Cache.debug("Exception was ", ex);
}
}
} catch (Exception ex)
{
- Cache.log.warn("Error parsing comma separated list of urls in "
+ Cache.warn("Error parsing comma separated list of urls in "
+ JWS2HOSTURLS + " preference.", ex);
}
return urls;
public Vector<Jws2Instance> getServices()
{
- return (services == null) ? new Vector<Jws2Instance>()
- : new Vector<Jws2Instance>(services);
+ return (services == null) ? new Vector<>()
+ : new Vector<>(services);
}
/**
try
{
compbio.ws.client.WSTester
- .main(new String[] { "-h=" + foo.toString() });
+ .main(new String[]
+ { "-h=" + foo.toString() });
} catch (Exception e)
{
e.printStackTrace();
{
if (urlsWithoutServices == null)
{
- urlsWithoutServices = new Vector<String>();
+ urlsWithoutServices = new Vector<>();
}
- if ((invalidServiceUrls == null || !invalidServiceUrls
- .contains(jwsservers))
+ if ((invalidServiceUrls == null
+ || !invalidServiceUrls.contains(jwsservers))
&& !urlsWithoutServices.contains(jwsservers))
{
urlsWithoutServices.add(jwsservers);
{
if (invalidServiceUrls == null)
{
- invalidServiceUrls = new Vector<String>();
+ invalidServiceUrls = new Vector<>();
}
if (!invalidServiceUrls.contains(jwsservers))
{
if (getUrlsWithoutServices() != null
&& getUrlsWithoutServices().size() > 0)
{
- ermsg.append(MessageManager.getString("warn.urls_no_jaba") + ": \n");
+ ermsg.append(
+ MessageManager.getString("warn.urls_no_jaba") + ": \n");
for (String svcurl : getUrlsWithoutServices())
{
if (list)
*/
public Jws2Instance getPreferredServiceFor(String[] serviceURLs)
{
- HashSet<String> urls = new HashSet<String>();
+ HashSet<String> urls = new HashSet<>();
urls.addAll(Arrays.asList(serviceURLs));
Jws2Instance match = null;
if (services != null)
return match;
}
- Map<String, Map<String, String>> preferredServiceMap = new HashMap<String, Map<String, String>>();;
+ Map<String, Map<String, String>> preferredServiceMap = new HashMap<>();
/**
* get current preferred service of the given type, or global default
String afid = (af == null) ? "" : af.getViewport().getSequenceSetId();
if (preferredServiceMap == null)
{
- preferredServiceMap = new HashMap<String, Map<String, String>>();
+ preferredServiceMap = new HashMap<>();
}
Map<String, String> prefmap = preferredServiceMap.get(afid);
if (prefmap == null)
{
- prefmap = new HashMap<String, String>();
+ prefmap = new HashMap<>();
preferredServiceMap.put(afid, prefmap);
}
prefmap.put(serviceType, selectedServer.getHost());
public void setPreferredServiceFor(String serviceType,
String serviceAction, Jws2Instance selectedServer)
{
- setPreferredServiceFor(null, serviceType, serviceAction, selectedServer);
+ setPreferredServiceFor(null, serviceType, serviceAction,
+ selectedServer);
}
/**
git://source.jalview.org / jalview.git / blobdiff