X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Frest%2FRestHandler.java;h=7c8c9a6cefdef63f94db95e7704f4385ca1ba0da;hb=4dd96dd41cb37178a6dc0298ce08c8bfcdfab715;hp=b897eaa7789361b2c0737e13bbf22cffce2f3143;hpb=208f2c3de82e3327c4f930ab7d04f5b812ccd277;p=jalview.git

diff --git a/src/jalview/rest/RestHandler.java b/src/jalview/rest/RestHandler.java
index b897eaa..7c8c9a6 100644
--- a/src/jalview/rest/RestHandler.java
+++ b/src/jalview/rest/RestHandler.java
@@ -20,7 +20,8 @@
  */
 package jalview.rest;
 
-import jalview.bin.Jalview;
+import jalview.bin.ApplicationSingletonProvider;
+import jalview.bin.ApplicationSingletonProvider.ApplicationSingletonI;
 import jalview.httpserver.AbstractRequestHandler;
 
 import java.io.IOException;
@@ -31,9 +32,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * A simple handler to process (or delegate) HTTP requests on /jalview/rest
+ * A simple handler to process (or delegate) HTTP requests on /jalview/rest.
  */
 public class RestHandler extends AbstractRequestHandler
+        implements ApplicationSingletonI
 {
   private static final String MY_PATH = "rest";
 
@@ -49,9 +51,7 @@ public class RestHandler extends AbstractRequestHandler
   {
     synchronized (RestHandler.class)
     {
-      Jalview j = Jalview.getInstance();
-      return (j.restHandler == null ? j.restHandler = new RestHandler()
-              : j.restHandler);
+      return (RestHandler) ApplicationSingletonProvider.getInstance(RestHandler.class);
     }
   }