JAL-1503 update version in GPL header

[jalview.git] / src / jalview / ws / jws2 / JabaWsServerQuery.java

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index b52420b..7248d7c 100644 (file)
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -1,20 +1,21 @@
-/*******************************************************************************
- * 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.1)
+ * 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.
- *
+ *  
  * 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 <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 /**
  * 
  */
@@ -22,6 +23,7 @@ package jalview.ws.jws2;
 
 import jalview.bin.Cache;
 import jalview.ws.jws2.jabaws2.Jws2Instance;
+import jalview.ws.jws2.jabaws2.Jws2InstanceFactory;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -66,9 +68,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[] 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 };
+
   /*
    * (non-Javadoc)
    * 
@@ -107,7 +117,14 @@ public class JabaWsServerQuery implements Runnable
 
             jabasws2 = true;
             srv_set = registry.getSupportedServices();
+            
+            // dan test
+            System.out.println("registry.getSupportedServices: " + srv_set.toString());
+            
             svccategories = registry.getServiceCategories();
+            
+            // dan test
+//            System.out.println("registry.getServiceCategories: " + svccategories.toString());
 
           }
         } catch (Exception ex)
@@ -162,13 +179,13 @@ public class JabaWsServerQuery implements Runnable
 
                 String description = registry.getServiceDescription(srv);
 
-                svc = new Jws2Instance(jwsservers, srv.toString(),
+                svc = Jws2InstanceFactory.newJws2Instance(jwsservers, srv.toString(),
                         cat.name, description, service);
               }
               if (svc == null)
               {
-                svc = new Jws2Instance(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);
             }