X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=2eb484b7056eeaa1ca694bec122ab78283fa771c;hb=2ada5fb71ea7f372826f2f91cb4bfe33b4a4c660;hp=fe61ff3fbf8d0e6ffaac0d6150ed4f2b4e527f09;hpb=6c54f6a2f72b57aa1f803d68241549e050ae68e8;p=jalview.git
diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index fe61ff3..2eb484b 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -1,19 +1,22 @@
/*
- * 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
+ * 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.
*/
/**
*
@@ -116,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)
@@ -178,13 +183,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);
}