X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=ef7f75014959cff285cf9940bbf8ab8f5e119b7e;hb=e01ceeed92f226bf74c9f516bce882b5cd816a62;hp=bed9397f045368ad5efe381498baa70e2b3bb99d;hpb=fe316906488ff714b5abb64185854ccda714c015;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 bed9397..ef7f750 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SonePlugin.java - Copyright © 2010–2012 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010–2013 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,6 +25,9 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.Core;
 import net.pterodactylus.sone.core.FreenetInterface;
 import net.pterodactylus.sone.core.WebOfTrustUpdater;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.database.memory.MemoryDatabase;
 import net.pterodactylus.sone.fcp.FcpInterface;
 import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
 import net.pterodactylus.sone.freenet.plugin.PluginConnector;
@@ -38,18 +41,6 @@ import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.logging.LoggingListener;
 import net.pterodactylus.util.version.Version;
 
-import com.google.common.eventbus.EventBus;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Singleton;
-import com.google.inject.TypeLiteral;
-import com.google.inject.matcher.Matchers;
-import com.google.inject.name.Names;
-import com.google.inject.spi.InjectionListener;
-import com.google.inject.spi.TypeEncounter;
-import com.google.inject.spi.TypeListener;
-
 import freenet.client.async.DatabaseDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
@@ -65,6 +56,18 @@ import freenet.pluginmanager.PluginRespirator;
 import freenet.support.SimpleFieldSet;
 import freenet.support.api.Bucket;
 
+import com.google.common.eventbus.EventBus;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import com.google.inject.Singleton;
+import com.google.inject.TypeLiteral;
+import com.google.inject.matcher.Matchers;
+import com.google.inject.name.Names;
+import com.google.inject.spi.InjectionListener;
+import com.google.inject.spi.TypeEncounter;
+import com.google.inject.spi.TypeListener;
+
 /**
  * This class interfaces with Freenet. It is the class that is loaded by the
  * node and starts up the whole Sone system.
@@ -98,7 +101,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 8, 4);
+	public static final Version VERSION = new Version(0, 8, 7);
 
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(SonePlugin.class);
@@ -156,9 +159,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	// FREDPLUGIN METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void runPlugin(PluginRespirator pluginRespirator) {
 		this.pluginRespirator = pluginRespirator;
@@ -207,6 +207,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			@Override
 			protected void configure() {
+				bind(Core.class).in(Singleton.class);
+				bind(MemoryDatabase.class).in(Singleton.class);
 				bind(EventBus.class).toInstance(eventBus);
 				bind(Configuration.class).toInstance(startConfiguration);
 				bind(FreenetInterface.class).in(Singleton.class);
@@ -217,6 +219,8 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 				bind(String.class).annotatedWith(Names.named("WebOfTrustContext")).toInstance("Sone");
 				bind(SonePlugin.class).toInstance(SonePlugin.this);
 				bind(FcpInterface.class).in(Singleton.class);
+				bind(Database.class).to(MemoryDatabase.class);
+				bind(SoneProvider.class).to(Core.class).in(Singleton.class);
 				bindListener(Matchers.any(), new TypeListener() {
 
 					@Override
@@ -271,9 +275,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		}
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void terminate() {
 		try {
@@ -282,9 +283,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			/* stop the core. */
 			core.stop();
-
-			/* stop the web of trust connector. */
-			webOfTrustConnector.stop();
 		} catch (Throwable t1) {
 			logger.log(Level.SEVERE, "Error while shutting down!", t1);
 		} finally {
@@ -297,9 +295,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	// INTERFACE FredPluginFCP
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) {
 		fcpInterface.handle(pluginReplySender, parameters, data, accessType);
@@ -309,17 +304,11 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	// INTERFACE FredPluginL10n
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getString(String key) {
 		return l10n.getBase().getString(key);
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public void setLanguage(LANGUAGE newLanguage) {
 		l10n = new PluginL10n(this, newLanguage);
@@ -329,33 +318,21 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	// INTERFACE FredPluginBaseL10n
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getL10nFilesBasePath() {
 		return "i18n";
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getL10nFilesMask() {
 		return "sone.${lang}.properties";
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getL10nOverrideFilesMask() {
 		return "sone.${lang}.override.properties";
 	}
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public ClassLoader getPluginClassLoader() {
 		return SonePlugin.class.getClassLoader();
@@ -365,9 +342,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	// INTERFACE FredPluginVersioned
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	public String getVersion() {
 		return VERSION.toString();