X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fws%2Fjws2%2FJws2ClientFactory.java;h=8a4f9fb3778aed0a5ede3047cd9d71d2b1baee4e;hb=d913da3552b4050d425eba551a50921efcc25f21;hp=6445cd57179819b2136338d8c314dce2364bcd6c;hpb=61632514caf99d7897843f8bb3e4378aa715d040;p=jalview.git

diff --git a/src/jalview/ws/jws2/Jws2ClientFactory.java b/src/jalview/ws/jws2/Jws2ClientFactory.java
index 6445cd5..8a4f9fb 100644
--- a/src/jalview/ws/jws2/Jws2ClientFactory.java
+++ b/src/jalview/ws/jws2/Jws2ClientFactory.java
@@ -1,7 +1,9 @@
 package jalview.ws.jws2;
 
+import jalview.api.AlignCalcManagerI2;
 import jalview.api.AlignCalcWorkerI;
 import jalview.bin.Cache;
+import jalview.bin.Console;
 import jalview.gui.AlignFrame;
 import jalview.gui.JvSwingUtils;
 import jalview.util.MessageManager;
@@ -50,24 +52,28 @@ public class Jws2ClientFactory
     // is there an aaCon worker already present - if so, set it to use the
     // given service handle
     {
-      List<AlignCalcWorkerI> aaconClient = alignFrame.getViewport()
-              .getCalcManager()
-              .getRegisteredWorkersOfClass(aaui.getClient());
-      if (aaconClient != null && aaconClient.size() > 0)
+      AlignCalcManagerI2 mger = alignFrame.getViewport()
+              .getCalcManager();
+      if (mger != null)
       {
-        SeqAnnotationServiceCalcWorker worker = (SeqAnnotationServiceCalcWorker) aaconClient
-                .get(0);
-        if (!worker.service.getHostURL().equals(service.getHostURL()))
+        List<AlignCalcWorkerI> aaconClient = mger
+                .getWorkersOfClass(aaui.getClient());
+        if (aaconClient != null && aaconClient.size() > 0)
         {
-          // javax.swing.SwingUtilities.invokeLater(new Runnable()
+          SeqAnnotationServiceCalcWorker worker = (SeqAnnotationServiceCalcWorker) aaconClient
+                  .get(0);
+          if (!worker.service.getHostURL().equals(service.getHostURL()))
           {
-            // @Override
-            // public void run()
+            // javax.swing.SwingUtilities.invokeLater(new Runnable()
             {
-              removeCurrentAAConWorkerFor(aaui, alignFrame);
-              buildCurrentAAConWorkerFor(aaui, alignFrame, service);
-            }
-          } // );
+              // @Override
+              // public void run()
+              {
+                removeCurrentAAConWorkerFor(aaui, alignFrame);
+                buildCurrentAAConWorkerFor(aaui, alignFrame, service);
+              }
+            } // );
+          }
         }
       }
     }
@@ -88,8 +94,8 @@ public class Jws2ClientFactory
         {
 
           List<AlignCalcWorkerI> aaconClient = alignFrame.getViewport()
-                  .getCalcManager().getRegisteredWorkersOfClass(
-                          SeqAnnotationServiceCalcWorker.class);
+                  .getCalcManager()
+                  .getWorkersOfClass(SeqAnnotationServiceCalcWorker.class);
           if (aaconClient != null)
           {
             for (AlignCalcWorkerI worker : aaconClient)
@@ -142,8 +148,8 @@ public class Jws2ClientFactory
             return;
           }
           List<AlignCalcWorkerI> aaconClient = alignFrame.getViewport()
-                  .getCalcManager().getRegisteredWorkersOfClass(
-                          SeqAnnotationServiceCalcWorker.class);
+                  .getCalcManager()
+                  .getWorkersOfClass(SeqAnnotationServiceCalcWorker.class);
 
           boolean serviceEnabled = false;
           if (aaconClient != null)
@@ -226,7 +232,7 @@ public class Jws2ClientFactory
       if (service != null && !fave.getService().getHostURL()
               .equals(service.getHostURL()))
       {
-        Cache.log.debug("Changing AACon service to " + service.getHostURL()
+        Console.debug("Changing AACon service to " + service.getHostURL()
                 + " from " + fave.getService().getHostURL());
         fave.setService(service);
       }
@@ -248,7 +254,7 @@ public class Jws2ClientFactory
       // if (!service.getServiceType()
       // .equals(compbio.ws.client.Services.AAConWS.toString()))
       // {
-      // Cache.log.warn(
+      // Console.warn(
       // "Ignoring invalid preferred service for AACon calculations (service
       // type was "
       // + service.getServiceType() + ")");
@@ -287,6 +293,6 @@ public class Jws2ClientFactory
           AlignFrame alignFrame)
   {
     alignFrame.getViewport().getCalcManager()
-            .removeRegisteredWorkersOfClass(aaui.getClient());
+            .removeWorkersOfClass(aaui.getClient());
   }
-}
\ No newline at end of file
+}