X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2Fjabaws2%2FJws2InstanceFactory.java;h=623b8de184e0021a3a4120abf4595fc47039974b;hb=5eeb49c62b1004b1efe837a543c8ff84aa6d7faf;hp=105a0c311ad996ee23a64fcb9342c48172259cba;hpb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;p=jalview.git diff --git a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java index 105a0c3..623b8de 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.9) - * Copyright (C) 2015 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. * @@ -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; @@ -38,7 +37,8 @@ public class Jws2InstanceFactory 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; } @@ -51,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()); } }