X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2InstanceFactory.java;h=c328670a091e4676cfa8b1c03e5bc2b291f6bfc2;hb=dbf124d82413368d7aba34f8e3d8e7ad25167dea;hp=e30488c16fc56f9a83c0fbdc077c3ba3ee82e6ce;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index e30488c..c328670 100644
--- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -20,9 +20,6 @@
  */
 package jalview.ws.jws2.jabaws2;
 
-import jalview.ws.jws2.AAConClient;
-import jalview.ws.jws2.JPred301Client;
-import jalview.ws.jws2.RNAalifoldClient;
 import jalview.ws.uimodel.AlignAnalysisUIText;
 
 import java.util.HashMap;
@@ -35,9 +32,11 @@ public class Jws2InstanceFactory
   private static HashMap<String, AlignAnalysisUIText> aaConGUI;
 
   private static HashSet<String> ignoreGUI;
+
   private static String category_rewrite(String cat_name)
   {
-    return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
+    return (cat_name != null && cat_name.equals("Prediction"))
+            ? "Secondary Structure Prediction"
             : cat_name;
   }
 
@@ -45,16 +44,13 @@ public class Jws2InstanceFactory
   {
     if (aaConGUI == null)
     {
-      aaConGUI = new HashMap<String, AlignAnalysisUIText>();
+      aaConGUI = new HashMap<>();
       aaConGUI.put(compbio.ws.client.Services.AAConWS.toString(),
-              AAConClient.getAlignAnalysisUITest());
+              AAConClient.getAlignAnalysisUIText());
       aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
-              RNAalifoldClient.getAlignAnalysisUITest());
-      // disable the JPred301 client in jalview ...
-      ignoreGUI = new HashSet<String>();
-      ignoreGUI.add(compbio.ws.client.Services.JpredWS.toString());
-      aaConGUI.put(compbio.ws.client.Services.JpredWS.toString(),
-              JPred301Client.getAlignAnalysisUITest());
+              RNAalifoldClient.getAlignAnalysisUIText());
+      // ignore list for JABAWS services not supported in jalview ...
+      ignoreGUI = new HashSet<>();
     }
   }
 
@@ -70,6 +66,7 @@ public class Jws2InstanceFactory
     init();
     return (ignoreGUI.contains(serviceType.toString()));
   }
+
   /**
    * construct a service instance and configure it with any additional
    * properties needed so Jalview can access it correctly
@@ -88,7 +85,7 @@ public class Jws2InstanceFactory
     init();
     Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
             category_rewrite(name), description, service);
-    svc.aaui = aaConGUI.get(serviceType.toString());
+    svc.setAlignAnalysisUI(aaConGUI.get(serviceType.toString()));
     return svc;
   }