*/
package jalview.ws.jws2.jabaws2;
-import jalview.bin.Instance;
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 HashMap<String, AlignAnalysisUIText> aaConGUI;
-
- private HashSet<String> ignoreGUI;
-
- public static Jws2InstanceFactory getInstance()
- {
- Instance j = Instance.getInstance();
- return (j.jws2InstanceFactory == null
- ? j.jws2InstanceFactory = new Jws2InstanceFactory()
- : j.jws2InstanceFactory);
- }
+ private static HashSet<String> ignoreGUI;
private static String category_rewrite(String cat_name)
{
: cat_name;
}
- private void init()
+ private static void init()
{
if (aaConGUI == null)
{
- aaConGUI = new HashMap<>();
+ aaConGUI = new HashMap<String, AlignAnalysisUIText>();
aaConGUI.put(compbio.ws.client.Services.AAConWS.toString(),
AAConClient.getAlignAnalysisUITest());
aaConGUI.put(compbio.ws.client.Services.RNAalifoldWS.toString(),
RNAalifoldClient.getAlignAnalysisUITest());
// ignore list for JABAWS services not supported in jalview ...
- ignoreGUI = new HashSet<>();
+ ignoreGUI = new HashSet<String>();
}
}
*/
public static boolean ignoreService(String serviceType)
{
- getInstance().init();
- return (getInstance().ignoreGUI.contains(serviceType.toString()));
+ init();
+ return (ignoreGUI.contains(serviceType.toString()));
}
/**
String serviceType, String name, String description,
JABAService service)
{
- getInstance().init();
+ init();
Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
category_rewrite(name), description, service);
- svc.aaui = getInstance().aaConGUI.get(serviceType.toString());
+ svc.aaui = aaConGUI.get(serviceType.toString());
return svc;
}