JAL-1379 a JPred v3.0.1 client via JABA 2.1

[jalview.git] / src / jalview / ws / jws2 / jabaws2 / Jws2InstanceFactory.java

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index 3ae0bc5..bcc7735 100644 (file)
--- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@ -23,18 +23,21 @@ package jalview.ws.jws2.jabaws2;
 import java.util.HashMap;
 
 import compbio.data.msa.JABAService;
-
 import jalview.ws.jws2.AAConClient;
+import jalview.ws.jws2.JPred301Client;
 import jalview.ws.jws2.RNAalifoldClient;
 import jalview.ws.uimodel.AlignAnalysisUIText;
 
 public class Jws2InstanceFactory
 {
   private static HashMap<String, AlignAnalysisUIText> aaConGUI;
+
   private static String category_rewrite(String cat_name)
   {
-    return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction" : cat_name;
+    return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
+            : cat_name;
   }
+
   private static void init()
   {
     if (aaConGUI == null)
@@ -44,6 +47,8 @@ public class Jws2InstanceFactory
               AAConClient.getAlignAnalysisUITest());
       aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
               RNAalifoldClient.getAlignAnalysisUITest());
+      aaConGUI.put(compbio.ws.client.Services.JpredWS.toString(),
+              JPred301Client.getAlignAnalysisUITest());
     }
   }
 
@@ -63,9 +68,9 @@ public class Jws2InstanceFactory
           JABAService service)
   {
     init();
-    Jws2Instance svc = new Jws2Instance(jwsservers, serviceType, category_rewrite(name),
-            description, service);
-    
+    Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
+            category_rewrite(name), description, service);
+
     svc.aaui = aaConGUI.get(serviceType.toString());
     return svc;
   }