X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=37fdb540d61094432e6e0944a9e8c93659cec208;hb=46a1d524d298ce4ef39356469c56dfec5ecef7ba;hp=fbf8b1ab38bbf374821e7c6198d66b3be166bb13;hpb=8ba12e622791bf6459d3614ac5d86436f9b409c5;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index fbf8b1a..37fdb54 100644 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@ -79,7 +79,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 } /** The version. */ - public static final Version VERSION = new Version(0, 3, 2); + public static final Version VERSION = new Version(0, 3, 4); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class); @@ -147,10 +147,13 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 /* create a configuration. */ Configuration oldConfiguration; Configuration newConfiguration = null; + boolean firstStart = !new File("sone.properties").exists(); + boolean newConfig = false; try { oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false)); newConfiguration = oldConfiguration; } catch (ConfigurationException ce1) { + newConfig = true; logger.log(Level.INFO, "Could not load configuration file, trying plugin store…", ce1); try { newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true)); @@ -195,6 +198,8 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 core.setConfiguration(newConfiguration); } webInterface.start(); + webInterface.setFirstStart(firstStart); + webInterface.setNewConfig(newConfig); identityManager.start(); startupFailed = false; } finally { @@ -224,7 +229,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 /* stop the identity manager. */ identityManager.stop(); - /* TODO wait for core to stop? */ try { pluginRespirator.putStore(pluginStore); } catch (DatabaseDisabledException dde1) {