JAL-3253 code tidies and tweaks to Desktop

[jalview.git] / src / jalview / httpserver / HttpServer.java

diff --git a/src/jalview/httpserver/HttpServer.java b/src/jalview/httpserver/HttpServer.java
index 8cb1846..f2daf2b 100644 (file)
--- a/src/jalview/httpserver/HttpServer.java
+++ b/src/jalview/httpserver/HttpServer.java
@@ -53,6 +53,31 @@ import org.eclipse.jetty.util.thread.QueuedThreadPool;
  */
 public class HttpServer implements ApplicationSingletonI
 {
+  /*
+   * 'context root' - actually just prefixed to the path for each handler for
+   * now - see registerHandler
+   */
+  private static final String JALVIEW_PATH = "jalview";
+
+  /*
+   * The Http server
+   */
+  private Server server;
+
+  /*
+   * Registered handlers for context paths
+   */
+  private HandlerCollection contextHandlers;
+
+  /*
+   * Lookup of ContextHandler by its wrapped handler
+   */
+  Map<Handler, ContextHandler> myHandlers = new HashMap<>();
+
+  /*
+   * The context root for the server
+   */
+  private URI contextRoot;
 
   /**
    * Returns the singleton instance of this class.
@@ -86,32 +111,6 @@ public class HttpServer implements ApplicationSingletonI
     registerHandler(RestHandler.getInstance());
   }
 
-  /*
-   * 'context root' - actually just prefixed to the path for each handler for
-   * now - see registerHandler
-   */
-  private static final String JALVIEW_PATH = "jalview";
-
-  /*
-   * The Http server
-   */
-  private Server server;
-
-  /*
-   * Registered handlers for context paths
-   */
-  private HandlerCollection contextHandlers;
-
-  /*
-   * Lookup of ContextHandler by its wrapped handler
-   */
-  Map<Handler, ContextHandler> myHandlers = new HashMap<>();
-
-  /*
-   * The context root for the server
-   */
-  private URI contextRoot;
-
   /**
    * Start the http server
    *