Make background map preference changes apply immediately

[simantics/district.git] / org.simantics.maps.server.ui / src / org / simantics / maps / server / ui / Activator.java

diff --git a/org.simantics.maps.server.ui/src/org/simantics/maps/server/ui/Activator.java b/org.simantics.maps.server.ui/src/org/simantics/maps/server/ui/Activator.java
index cd46e1a517f5c57dcaf64acef5cfe6d8a5570740..14d121013b48e0a725da838014263128da45990e 100644 (file)
--- a/org.simantics.maps.server.ui/src/org/simantics/maps/server/ui/Activator.java
+++ b/org.simantics.maps.server.ui/src/org/simantics/maps/server/ui/Activator.java
@@ -4,9 +4,13 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.simantics.district.maps.server.TileserverMapnikInstance;
 import org.simantics.district.maps.server.prefs.MapsServerPreferences;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class Activator implements BundleActivator {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(Activator.class);
+    
     public static final String PLUGIN_ID = "org.simantics.maps.server.ui";
     
     private static BundleContext context;
@@ -27,13 +31,9 @@ public class Activator implements BundleActivator {
         // Let's see if server should be automatically started
         if (MapsServerPreferences.startAutomatically()) {
             // execute in a separate thread to not slow down the startup process
-            new Thread(() -> {
-                try {
-                    TileserverMapnikInstance.get().start();
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }).start();
+            if (LOGGER.isDebugEnabled())
+                LOGGER.debug("Starting tileserver mapnik automatically");
+            new TileserverMapnikStartJob(status -> {}).schedule();
         }
     }
 
@@ -45,6 +45,8 @@ public class Activator implements BundleActivator {
      */
     public void stop(BundleContext bundleContext) throws Exception {
         // Stop the server
+        if (LOGGER.isDebugEnabled())
+            LOGGER.debug("Stopping tileserver mapnik");
         TileserverMapnikInstance.get().stop();
         Activator.context = null;
     }