X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=219f989f463bae40cb66837f10d8e0f4cde970e9;hb=a474ae28d3820854e9a8d8ea5b9f3a44b06fa737;hp=a24802b39a8f84f567a23dea64a71797e3b67859;hpb=a7289fbfa428ebc9c1facb48be08587feb0ee489;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 a24802b..219f989 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -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(0, 3, 2);
+	public static final Version VERSION = new Version(0, 3, 6, 5);
 
 	/** 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;
 
@@ -170,36 +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);
-		webInterface.setFirstStart(firstStart);
-		webInterface.setNewConfig(newConfig);
-		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 {
@@ -228,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();