Merge branch 'develop' into alpha/JAL-3362_Jalview_212_alpha

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

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 1b8dda7..c9646b4 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -143,7 +143,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 
   protected static final String CONFIRM_KEYBOARD_QUIT = "CONFIRM_KEYBOARD_QUIT";
 
-  public static HashMap<String, FileWriter> savingFiles = new HashMap<>();
+  public static HashMap<String, FileWriter> savingFiles = new HashMap<String, FileWriter>();
 
   private JalviewChangeSupport changeSupport = new JalviewChangeSupport();
 
@@ -1499,7 +1499,8 @@ public class Desktop extends jalview.jbgui.GDesktop
       return;
     }
 
-    AlignmentViewport source = null, target = null;
+    AlignViewportI source = null;
+    AlignViewportI target = null;
     if (frames[0] instanceof AlignFrame)
     {
       source = ((AlignFrame) frames[0]).getCurrentView();
@@ -2602,7 +2603,9 @@ public class Desktop extends jalview.jbgui.GDesktop
     }
     Thread t3 = null;
     {
-      // TODO: do rest service discovery
+      // start slivka discovery
+      t3 = new Thread(jalview.ws.slivkaws.SlivkaWSDiscoverer.getInstance());
+      t3.start();
     }
     if (blocking)
     {