X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=1fdb3ac07958edb94f8ad8c3257156dbc6bf18cc;hb=c19d2a91ca05e052e3408bf5852d88eb5d0608f1;hp=70a3475e8ce3297d6c7c25970942ced03bd16d03;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java index 70a3475..1fdb3ac 100644 --- a/src/jalview/ws/jws2/JabaWsServerQuery.java +++ b/src/jalview/ws/jws2/JabaWsServerQuery.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -74,15 +74,15 @@ public class JabaWsServerQuery implements Runnable this.jwsserver = server; } - Services[] JABAWS1SERVERS = new Services[] - { Services.ClustalWS, Services.MuscleWS, Services.MafftWS, - Services.ProbconsWS, Services.TcoffeeWS }; + Services[] JABAWS1SERVERS = new Services[] { Services.ClustalWS, + Services.MuscleWS, Services.MafftWS, Services.ProbconsWS, + Services.TcoffeeWS }; - Services[] JABAWS2SERVERS = new Services[] - { Services.ClustalWS, Services.MuscleWS, Services.MafftWS, - Services.ProbconsWS, Services.TcoffeeWS, Services.AAConWS, - Services.DisemblWS, Services.GlobPlotWS, Services.IUPredWS, - Services.JronnWS, Services.RNAalifoldWS }; + Services[] JABAWS2SERVERS = new Services[] { Services.ClustalWS, + Services.MuscleWS, Services.MafftWS, Services.ProbconsWS, + Services.TcoffeeWS, Services.AAConWS, Services.DisemblWS, + Services.GlobPlotWS, Services.IUPredWS, Services.JronnWS, + Services.RNAalifoldWS }; /* * (non-Javadoc) @@ -169,9 +169,8 @@ public class JabaWsServerQuery implements Runnable service = Jws2Client.connect(jwsserver, srv); } catch (Exception e) { - System.err.println("Jws2 Discoverer: Problem on " - + jwsserver + " with service " + srv + ":\n" - + e.getMessage()); + System.err.println("Jws2 Discoverer: Problem on " + jwsserver + + " with service " + srv + ":\n" + e.getMessage()); if (!(e instanceof javax.xml.ws.WebServiceException)) { e.printStackTrace(); @@ -237,8 +236,10 @@ public class JabaWsServerQuery implements Runnable { // return Jws2Client.validURL(jwsserver); // checks syntax only boolean result = false; - if (server != null) { - try { + if (server != null) + { + try + { URL url = new URL(server); url.openStream().close(); result = true;