X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJabaWsServerQuery.java;h=2eb484b7056eeaa1ca694bec122ab78283fa771c;hb=057f733ab390518a3641f1dedebd36c028bf03d6;hp=61810e8a4ea5e13e6750540186f95c06c32f8ca5;hpb=52a6409c5880b3e108e7c77e756222ed22f6b87f;p=jalview.git

diff --git a/src/jalview/ws/jws2/JabaWsServerQuery.java b/src/jalview/ws/jws2/JabaWsServerQuery.java
index 61810e8..2eb484b 100644
--- a/src/jalview/ws/jws2/JabaWsServerQuery.java
+++ b/src/jalview/ws/jws2/JabaWsServerQuery.java
@@ -1,20 +1,23 @@
-/*******************************************************************************
- * 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.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 <http://www.gnu.org/licenses/>.
- *******************************************************************************/
+ * 
+ * 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 +25,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;
@@ -67,6 +71,16 @@ public class JabaWsServerQuery implements Runnable
     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.RNAalifoldWS };
+
   /*
    * (non-Javadoc)
    * 
@@ -105,8 +119,17 @@ 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)
         {
@@ -116,9 +139,7 @@ public class JabaWsServerQuery implements Runnable
           // in that case, look for each service endpoint
           System.err.println("JWS2 Discoverer: " + jwsservers
                   + " is a JABAWS1 server. Using hardwired list.");
-          for (Services srv : new Services[]
-          { Services.ClustalWS, Services.MuscleWS, Services.MafftWS,
-              Services.ProbconsWS, Services.TcoffeeWS })
+          for (Services srv : JABAWS1SERVERS)
           {
             srv_set.add(srv);
           }
@@ -162,12 +183,13 @@ public class JabaWsServerQuery implements Runnable
 
                 String description = registry.getServiceDescription(srv);
 
-                svc = new Jws2Instance(jwsservers, srv.toString(),
-                        cat.name, description, service);
+                svc = Jws2InstanceFactory.newJws2Instance(jwsservers,
+                        srv.toString(), cat.name, description, service);
               }
               if (svc == null)
               {
-                svc = new Jws2Instance(jwsservers, srv.toString(), cat.name,
+                svc = Jws2InstanceFactory.newJws2Instance(jwsservers,
+                        srv.toString(), cat.name,
                         "JABAWS 1 Alignment Service", service);
               }
               jws2Discoverer.addService(jwsservers, svc);