JAL-3066 JAL-3070 pull up non-jabaws specific service descriptor components for annot...

[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 db50a9d..c328670 100644 (file)
--- 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,23 @@
  */
 package jalview.ws.jws2.jabaws2;
 
+import jalview.ws.uimodel.AlignAnalysisUIText;
+
 import java.util.HashMap;
+import java.util.HashSet;
 
 import compbio.data.msa.JABAService;
 
-import jalview.ws.jws2.AAConClient;
-import jalview.ws.jws2.RNAalifoldClient;
-import jalview.ws.uimodel.AlignAnalysisUIText;
-
 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;
   }
 
@@ -42,15 +44,30 @@ 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());
+              RNAalifoldClient.getAlignAnalysisUIText());
+      // ignore list for JABAWS services not supported in jalview ...
+      ignoreGUI = new HashSet<>();
     }
   }
 
   /**
+   * 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
    * 
@@ -68,8 +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;
   }