Merge branch 'JAL-1601-direct-jpred4-rest-service' into development/Release_2_12_Branch

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index b125cc2..b671f9c 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -259,8 +259,7 @@ public class Desktop extends GDesktop
   public static Desktop getInstance()
   {
     return Jalview.isHeadlessMode() ? null
-            : (Desktop) ApplicationSingletonProvider
-                    .getInstance(Desktop.class);
+            : ApplicationSingletonProvider.getInstance(Desktop.class);
   }
 
   public static StructureSelectionManager getStructureSelectionManager()
@@ -2572,6 +2571,13 @@ public class Desktop extends GDesktop
   }
   
   @Override
+  public void addProgressBar(long id, String message)
+  {
+    // TODO
+    throw new UnsupportedOperationException("not implemented");
+  }
+
+  @Override
   public void removeProgressBar(long id)
   {
     //TODO
@@ -2733,7 +2739,18 @@ public class Desktop extends GDesktop
     }
     if (Cache.getDefault("SHOW_SLIVKA_SERVICES", true))
     {
-      tasks.add(jalview.ws.slivkaws.SlivkaWSDiscoverer.getInstance().startDiscoverer());
+      tasks.add(jalview.ws2.client.slivka.SlivkaWSDiscoverer
+          .getInstance().startDiscoverer());
+    }
+    if (Cache.getDefault("SHOW_EBI_SERVICES", true))
+    {
+      tasks.add(jalview.ws2.client.ebi.JobDispatcherWSDiscoverer
+              .getInstance().startDiscoverer());
+    }
+    if (Cache.getDefault("SHOW_JPRED4_SERVICES", true))
+    {
+      tasks.add(jalview.ws2.client.jpred4.JPred4WSDiscoverer
+              .getInstance().startDiscoverer());
     }
     if (blocking)
     {