X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=a08a2330f5e64860ff9e8fed7adcf6bad804f85a;hb=40d0dccb97f3e3fd9503ae7acc55e2a8ec85977d;hp=7248d7c2619d99d61b8c47e95345ce1259226d74;hpb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;p=jalview.git diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java index 7248d7c..a08a233 100644 --- a/src/jalview/ws/jws2/JabaWsServerQuery.java +++ b/src/jalview/ws/jws2/JabaWsServerQuery.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1) + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) * Copyright (C) 2014 The Jalview Authors * * 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. + * 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ /** @@ -117,14 +119,16 @@ public class JabaWsServerQuery implements Runnable jabasws2 = true; srv_set = registry.getSupportedServices(); - + // dan test - System.out.println("registry.getSupportedServices: " + srv_set.toString()); - + System.out.println("registry.getSupportedServices: " + + srv_set.toString()); + svccategories = registry.getServiceCategories(); - + // dan test -// System.out.println("registry.getServiceCategories: " + svccategories.toString()); + // System.out.println("registry.getServiceCategories: " + + // svccategories.toString()); } } catch (Exception ex) @@ -140,6 +144,7 @@ public class JabaWsServerQuery implements Runnable srv_set.add(srv); } } + for (Category cat : categories) { for (Services srv : cat.getServices()) @@ -179,13 +184,14 @@ public class JabaWsServerQuery implements Runnable String description = registry.getServiceDescription(srv); - svc = Jws2InstanceFactory.newJws2Instance(jwsservers, srv.toString(), - cat.name, description, service); + svc = Jws2InstanceFactory.newJws2Instance(jwsservers, + srv.toString(), cat.name, description, service); } if (svc == null) { - svc = Jws2InstanceFactory.newJws2Instance(jwsservers, srv.toString(), - cat.name, "JABAWS 1 Alignment Service", service); + svc = Jws2InstanceFactory.newJws2Instance(jwsservers, + srv.toString(), cat.name, + "JABAWS 1 Alignment Service", service); } jws2Discoverer.addService(jwsservers, svc); }