X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2InstanceFactory.java;h=623b8de184e0021a3a4120abf4595fc47039974b;hb=aace9d05c0870c703bfdfb28c1608213cee019bf;hp=3923bba62e0d7b0755770ccbfd72a2a0f7968a93;hpb=6c54f6a2f72b57aa1f803d68241549e050ae68e8;p=jalview.git
diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
index 3923bba..623b8de 100644
--- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@ -1,17 +1,47 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.
+ *
+ * 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
package jalview.ws.jws2.jabaws2;
-import java.util.HashMap;
-
-import compbio.data.msa.JABAService;
-
import jalview.ws.jws2.AAConClient;
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 aaConGUI;
+ private static HashSet ignoreGUI;
+
+ private static String category_rewrite(String cat_name)
+ {
+ return (cat_name != null && cat_name.equals("Prediction"))
+ ? "Secondary Structure Prediction"
+ : cat_name;
+ }
+
private static void init()
{
if (aaConGUI == null)
@@ -21,10 +51,25 @@ public class Jws2InstanceFactory
AAConClient.getAlignAnalysisUITest());
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
RNAalifoldClient.getAlignAnalysisUITest());
+ // 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
*
@@ -40,9 +85,8 @@ public class Jws2InstanceFactory
JABAService service)
{
init();
- Jws2Instance svc = new Jws2Instance(jwsservers, serviceType, name,
- description, service);
-
+ Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
+ category_rewrite(name), description, service);
svc.aaui = aaConGUI.get(serviceType.toString());
return svc;
}