Merge branch 'master' into next

[Sone.git] / src / main / java / net / pterodactylus / sone / main / SonePlugin.java

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index 84e155e..7ada162 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
 /*
- * FreenetSone - SonePlugin.java - Copyright © 2010 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
+import net.pterodactylus.sone.freenet.plugin.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.IdentityManager;
-import net.pterodactylus.sone.freenet.wot.PluginConnector;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
@@ -44,7 +44,6 @@ import freenet.pluginmanager.FredPluginL10n;
 import freenet.pluginmanager.FredPluginThreadless;
 import freenet.pluginmanager.FredPluginVersioned;
 import freenet.pluginmanager.PluginRespirator;
-import freenet.pluginmanager.PluginStore;
 
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
@@ -79,7 +78,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        }
 
        /** The version. */
-       public static final Version VERSION = new Version("RC4", 0, 3, 2);
+       public static final Version VERSION = new Version(0, 6, 2);
 
        /** The logger. */
        private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -96,9 +95,6 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
        /** The l10n helper. */
        private PluginL10n l10n;
 
-       /** The plugin store. */
-       private PluginStore pluginStore;
-
        /** The identity manager. */
        private IdentityManager identityManager;
 
@@ -147,16 +143,19 @@ 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) {
-                       logger.log(Level.INFO, "Could not load configuration file, trying plugin store…");
+                       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));
                                logger.log(Level.INFO, "Created new configuration file.");
                        } catch (ConfigurationException ce2) {
-                               logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!");
+                               logger.log(Level.SEVERE, "Could not create configuration file, using Plugin Store!", ce2);
                        }
                        try {
                                oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
@@ -167,34 +166,36 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10
                        }
                }
 
-               /* create freenet interface. */
-               FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode(), pluginRespirator.getHLSimpleClient());
+               boolean startupFailed = true;
+               try {
+                       /* create freenet interface. */
+                       FreenetInterface freenetInterface = new FreenetInterface(pluginRespirator.getNode());
 
-               /* create web of trust connector. */
-               PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
-               WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
-               identityManager = new IdentityManager(webOfTrustConnector);
-               identityManager.setContext("Sone");
+                       /* create web of trust connector. */
+                       PluginConnector pluginConnector = new PluginConnector(pluginRespirator);
+                       WebOfTrustConnector webOfTrustConnector = new WebOfTrustConnector(pluginConnector);
+                       identityManager = new IdentityManager(webOfTrustConnector);
+                       identityManager.setContext("Sone");
 
-               /* create core. */
-               core = new Core(oldConfiguration, freenetInterface, identityManager);
+                       /* create core. */
+                       core = new Core(oldConfiguration, freenetInterface, identityManager);
 
-               /* create the web interface. */
-               webInterface = new WebInterface(this);
-               core.addCoreListener(webInterface);
+                       /* create the web interface. */
+                       webInterface = new WebInterface(this);
+                       core.addCoreListener(webInterface);
 
-               /* create the identity manager. */
-               identityManager.addIdentityListener(core);
+                       /* create the identity manager. */
+                       identityManager.addIdentityListener(core);
 
-               /* start core! */
-               boolean startupFailed = true;
-               try {
+                       /* start core! */
                        core.start();
                        if ((newConfiguration != null) && (oldConfiguration != newConfiguration)) {
                                logger.log(Level.INFO, "Setting configuration to file-based configuration.");
                                core.setConfiguration(newConfiguration);
                        }
                        webInterface.start();
+                       webInterface.setFirstStart(firstStart);
+                       webInterface.setNewConfig(newConfig);
                        identityManager.start();
                        startupFailed = false;
                } finally {
@@ -223,14 +224,8 @@ 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) {
-                               logger.log(Level.WARNING, "Could not store plugin store, database is disabled.", dde1);
-                       }
-
+               } catch (Throwable t1) {
+                       logger.log(Level.SEVERE, "Error while shutting down!", t1);
                } finally {
                        /* shutdown logger. */
                        Logging.shutdown();