X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=99090345f04fa715eee34010ec13e5e62b21a25a;hb=99888ce13cc17d49f5e217ab6f2c9ad5ef168792;hp=6d32b500d38c00254f7e82a8fe1f0592f076d820;hpb=5d8f3ac133544177412ec3c533e5f5f92a7b1c35;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 6d32b50..9909034 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
@@ -38,11 +38,17 @@ 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;
@@ -184,6 +190,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		}
 
 		final Configuration startConfiguration = oldConfiguration;
+		final EventBus eventBus = new EventBus();
 
 		/* Freenet injector configuration. */
 		AbstractModule freenetModule = new AbstractModule() {
@@ -200,6 +207,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 			@Override
 			protected void configure() {
+				bind(EventBus.class).toInstance(eventBus);
 				bind(Configuration.class).toInstance(startConfiguration);
 				bind(FreenetInterface.class).in(Singleton.class);
 				bind(PluginConnector.class).in(Singleton.class);
@@ -209,7 +217,21 @@ 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);
+				bindListener(Matchers.any(), new TypeListener() {
+
+					@Override
+					public <I> void hear(TypeLiteral<I> typeLiteral, TypeEncounter<I> typeEncounter) {
+						typeEncounter.register(new InjectionListener<I>() {
+
+							@Override
+							public void afterInjection(I injectee) {
+								eventBus.register(injectee);
+							}
+						});
+					}
+				});
 			}
+
 		};
 		Injector injector = Guice.createInjector(freenetModule, soneModule);
 		core = injector.getInstance(Core.class);
@@ -223,7 +245,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 		/* create the web interface. */
 		webInterface = injector.getInstance(WebInterface.class);
-		core.addCoreListener(webInterface);
 
 		boolean startupFailed = true;
 		try {