Merge branch 'Jalview-JS/develop' into merge_js_develop

[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 1983ff5..8eeef4d 100644 (file)
--- a/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
+++ b/src/jalview/ws/jws2/jabaws2/Jws2InstanceFactory.java
@@ -22,8 +22,7 @@ package jalview.ws.jws2.jabaws2;
 
 import jalview.bin.ApplicationSingletonProvider;
 import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
-import jalview.ws.jws2.AAConClient;
-import jalview.ws.jws2.RNAalifoldClient;
+
 import jalview.ws.uimodel.AlignAnalysisUIText;
 
 import java.util.HashMap;
@@ -62,9 +61,9 @@ public class Jws2InstanceFactory implements ApplicationSingletonI
     {
       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<>();
     }
@@ -101,7 +100,7 @@ public class Jws2InstanceFactory implements ApplicationSingletonI
     getInstance().init();
     Jws2Instance svc = new Jws2Instance(jwsservers, serviceType,
             category_rewrite(name), description, service);
-    svc.aaui = getInstance().aaConGUI.get(serviceType.toString());
+    svc.setAlignAnalysisUI(getInstance().aaConGUI.get(serviceType.toString()));
     return svc;
   }