X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=82ab065f19045ff65b75c2bf0c79fc2514adaf93;hp=a6ade6b584166abdab0ae17711b6b5b874c6ce57;hb=HEAD;hpb=d33e7e73ccdc7a1ed8b32b13bbe12f84aa076e6b

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index a6ade6b..82ab065 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–2019 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010–2020 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
@@ -22,6 +22,8 @@ import static java.util.logging.Logger.*;
 import java.util.logging.Logger;
 import java.util.logging.*;
 
+import javax.annotation.Nonnull;
+
 import net.pterodactylus.sone.core.*;
 import net.pterodactylus.sone.core.event.*;
 import net.pterodactylus.sone.fcp.*;
@@ -40,7 +42,6 @@ import com.google.common.annotations.*;
 import com.google.common.eventbus.*;
 import com.google.common.cache.*;
 import com.google.inject.*;
-import com.google.inject.Module;
 import com.google.inject.name.*;
 import kotlin.jvm.functions.*;
 
@@ -60,7 +61,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			private final LoadingCache<String, Class<?>> classCache = CacheBuilder.newBuilder()
 					.build(new CacheLoader<String, Class<?>>() {
 						@Override
-						public Class<?> load(String key) throws Exception {
+						public Class<?> load(@Nonnull String key) throws Exception {
 							return SonePlugin.class.getClassLoader().loadClass(key);
 						}
 					});
@@ -93,9 +94,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The current year at time of release. */
-	private static final int YEAR = 2019;
+	private static final int YEAR = 2020;
 	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
-	private static final int LATEST_EDITION = 79;
+	private static final int LATEST_EDITION = 81;
 
 	/** The logger. */
 	private static final Logger logger = getLogger(SonePlugin.class.getName());
@@ -108,6 +109,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	/** The core. */
 	private Core core;
 
+	/** The event bus. */
+	private EventBus eventBus;
+
 	/** The web interface. */
 	private WebInterface webInterface;
 
@@ -203,21 +207,29 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		/* we need to request this to install all notification handlers. */
 		injector.getInstance(NotificationHandler.class);
 
+		/* and this is required to shutdown all tickers. */
+		injector.getInstance(TickerShutdown.class);
+
 		/* start core! */
 		core.start();
 
 		/* start the web interface! */
 		webInterface.start();
 
+		/* send some events on startup */
+		eventBus = injector.getInstance(EventBus.class);
+
 		/* first start? */
 		if (injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart")))) {
-			injector.getInstance(EventBus.class).post(new FirstStart());
+			eventBus.post(new FirstStart());
 		} else {
 			/* new config? */
 			if (injector.getInstance(Key.get(Boolean.class, Names.named("NewConfig")))) {
-				injector.getInstance(EventBus.class).post(new ConfigNotRead());
+				eventBus.post(new ConfigNotRead());
 			}
 		}
+
+		eventBus.post(new Startup());
 	}
 
 	@VisibleForTesting
@@ -240,6 +252,9 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	 */
 	@Override
 	public void terminate() {
+		/* send shutdown event. */
+		eventBus.post(new Shutdown());
+
 		try {
 			/* stop the web interface. */
 			webInterface.stop();