X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=73d5654b1efc38daf39fd763df5a27b86e591d09;hb=c7aec7d18ae7567c160be71b318139a9aa2b1c32;hp=089aceaa22b7331750ffbc9cd2d351bd2908787d;hpb=19b8cde9d790c5b3e74d8a13b1a9d082936c4dfe;p=jalview.git diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java index 089acea..73d5654 100644 --- a/src/jalview/ws/jws2/JabaWsServerQuery.java +++ b/src/jalview/ws/jws2/JabaWsServerQuery.java @@ -1,20 +1,20 @@ -/******************************************************************************* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle - * +/* + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) + * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * * This file is part of Jalview. - * + * * Jalview is free software: you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - * + * * Jalview is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty * of MERCHANTABILITY or FITNESS FOR A PARTICULAR * PURPOSE. See the GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . - *******************************************************************************/ + */ /** * */ @@ -66,13 +66,17 @@ public class JabaWsServerQuery implements Runnable this.jws2Discoverer = jws2Discoverer; this.jwsservers = jwsservers; } - 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[] 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 }; + /* * (non-Javadoc) * @@ -171,8 +175,8 @@ public class JabaWsServerQuery implements Runnable } if (svc == null) { - svc = new Jws2Instance(jwsservers, srv.toString(), cat.name, - "JABAWS 1 Alignment Service", service); + svc = new Jws2Instance(jwsservers, srv.toString(), + cat.name, "JABAWS 1 Alignment Service", service); } jws2Discoverer.addService(jwsservers, svc); }