X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2InstanceFactory.java;h=623b8de184e0021a3a4120abf4595fc47039974b;hb=e464da0ea20b0322846ce623598a16f2a1cba7ae;hp=4da96c2e3924b905fb0b6a3f1708b9ecb638bf0b;hpb=ad15cff29620f960119f80176f1fd443da9f6763;p=jalview.git diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java index 4da96c2..623b8de 100644 --- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java +++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java @@ -21,7 +21,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; @@ -35,9 +34,11 @@ 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" + return (cat_name != null && cat_name.equals("Prediction")) + ? "Secondary Structure Prediction" : cat_name; } @@ -50,11 +51,8 @@ public class Jws2InstanceFactory AAConClient.getAlignAnalysisUITest()); aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(), RNAalifoldClient.getAlignAnalysisUITest()); - // disable the JPred301 client in jalview ... + // ignore list for JABAWS services not supported in jalview ... ignoreGUI = new HashSet(); - ignoreGUI.add(compbio.ws.client.Services.JpredWS.toString()); - aaConGUI.put(compbio.ws.client.Services.JpredWS.toString(), - JPred301Client.getAlignAnalysisUITest()); } } @@ -70,6 +68,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