X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=027c6f8a9d2aea1f44b896f5c0ba8beb8b2ddddb;hp=8b7acd4a268c5bd3dd0614087e8db5de84b365fa;hb=d552208a4e3bb788d31cb9e4c4f32ed012c0f92b;hpb=6345739250dbb9e3c931a0b2c0abd1cf2bfbf67a

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 8b7acd4..027c6f8 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -18,7 +18,6 @@
 package net.pterodactylus.sone.main;
 
 import java.io.File;
-import java.util.Collections;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -33,7 +32,6 @@ import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
 import net.pterodactylus.util.config.ConfigurationException;
 import net.pterodactylus.util.config.MapConfigurationBackend;
-import net.pterodactylus.util.config.XMLConfigurationBackend;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
@@ -81,7 +79,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version("RC3", 0, 2);
+	public static final Version VERSION = new Version("RC2", 0, 3, 2);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -147,16 +145,25 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		this.pluginRespirator = pluginRespirator;
 
 		/* create a configuration. */
-		Configuration configuration;
+		Configuration oldConfiguration;
+		Configuration newConfiguration = null;
 		try {
-			configuration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
-		} catch (DatabaseDisabledException dde1) {
-			logger.log(Level.WARNING, "Could not load plugin store, using XML files.");
+			oldConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), false));
+			newConfiguration = oldConfiguration;
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.INFO, "Could not load configuration file, trying plugin store…");
 			try {
-				configuration = new Configuration(new XMLConfigurationBackend(new File("sone.xml"), true));
-			} catch (ConfigurationException ce1) {
-				logger.log(Level.SEVERE, "Could not load or create the “sone.xml” configuration file!");
-				configuration = new Configuration(new MapConfigurationBackend(Collections.<String, String> emptyMap()));
+				newConfiguration = new Configuration(new MapConfigurationBackend(new File("sone.properties"), true));
+				logger.log(Level.INFO, "Created new configuration file.");
+			} catch (ConfigurationException ce2) {
+				logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!");
+			}
+			try {
+				oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
+				logger.log(Level.INFO, "Plugin store loaded.");
+			} catch (DatabaseDisabledException dde1) {
+				logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
+				oldConfiguration = new Configuration(new MapConfigurationBackend());
 			}
 		}
 
@@ -169,11 +176,12 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		identityManager = new IdentityManager(webOfTrustConnector);
 		identityManager.setContext("Sone");
 
+		/* create core. */
+		core = new Core(oldConfiguration, freenetInterface, identityManager);
+
 		/* create the web interface. */
 		webInterface = new WebInterface(this);
-
-		/* create core. */
-		core = new Core(configuration, freenetInterface, identityManager);
+		core.addCoreListener(webInterface);
 
 		/* create the identity manager. */
 		identityManager.addIdentityListener(core);
@@ -182,6 +190,10 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
 		boolean startupFailed = true;
 		try {
 			core.start();
+			if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
+				logger.log(Level.INFO, "Setting configuration to file-based configuration.");
+				core.setConfiguration(newConfiguration);
+			}
 			webInterface.start();
 			identityManager.start();
 			startupFailed = false;