X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2InstanceFactory.java;h=7c8395f86485b99fd688c9bcedd3ab1e37c96f5d;hb=37de9310bec3501cbc6381e0c3dcb282fcaad812;hp=3ae0bc5926464881b023fa5d170b8721772512de;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index 3ae0bc5..7c8395f 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.2)
- * 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,21 +20,28 @@
  */
 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;
 
+import java.util.HashMap;
+import java.util.HashSet;
+
+import compbio.data.msa.JABAService;
+
 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" : cat_name;
+    return (cat_name != null && cat_name.equals("Prediction")) ? "Secondary Structure Prediction"
+            : cat_name;
   }
+
   private static void init()
   {
     if (aaConGUI == null)
@@ -44,10 +51,28 @@ public class Jws2InstanceFactory
               AAConClient.getAlignAnalysisUITest());
       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());
     }
   }
 
   /**
+   * exclusion list to avoid creating GUI elements for services we don't fully
+   * support
+   * 
+   * @param serviceType
+   * @return
+   */
+  public static boolean ignoreService(String serviceType)
+  {
+    init();
+    return (ignoreGUI.contains(serviceType.toString()));
+  }
+
+  /**
    * construct a service instance and configure it with any additional
    * properties needed so Jalview can access it correctly
    * 
@@ -63,9 +88,8 @@ 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;
   }