X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=82a02173ca0283e9805dfd8d93d50555a903abc9;hp=c1628eb8d7b56df7b53d177a4b93a548d32b4669;hb=5620fa68925a7b57ee9330e252fc935c30bf9621;hpb=e347c497255e7f5911039e4a3273aa2a367e6805 diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index c1628eb..82a0217 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–2016 David Roden + * Sone - SonePlugin.java - Copyright © 2010–2019 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 @@ -26,7 +26,11 @@ import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; +import javax.inject.Singleton; + import net.pterodactylus.sone.core.Core; +import net.pterodactylus.sone.database.Database; +import net.pterodactylus.sone.database.memory.MemoryDatabase; import net.pterodactylus.sone.fcp.FcpInterface; import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend; import net.pterodactylus.sone.freenet.wot.Context; @@ -68,8 +72,6 @@ import freenet.support.api.Bucket; /** * This class interfaces with Freenet. It is the class that is loaded by the * node and starts up the whole Sone system. - * - * @author David ‘Bombe’ Roden */ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, FredPluginBaseL10n, FredPluginThreadless, FredPluginVersioned { @@ -117,7 +119,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr /** The current year at time of release. */ private static final int YEAR = 2017; private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/"; - private static final int LATEST_EDITION = 76; + private static final int LATEST_EDITION = 77; /** The logger. */ private static final Logger logger = getLogger(SonePlugin.class.getName()); @@ -176,7 +178,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr return (version == null) ? "unknown" : version.getNice(); } - public static int getYear() { + public int getYear() { return YEAR; } @@ -252,6 +254,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr bind(PluginVersion.class).toInstance(new PluginVersion(getVersion())); bind(PluginYear.class).toInstance(new PluginYear(getYear())); bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage())); + bind(Database.class).to(MemoryDatabase.class).in(Singleton.class); if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) { String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null); if (path != null) { @@ -405,46 +408,4 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr return getPluginVersion(); } - public static class PluginVersion { - - private final String version; - - public PluginVersion(String version) { - this.version = version; - } - - public String getVersion() { - return version; - } - - } - - public static class PluginYear { - - private final int year; - - public PluginYear(int year) { - this.year = year; - } - - public int getYear() { - return year; - } - - } - - public static class PluginHomepage { - - private final String homepage; - - public PluginHomepage(String homepage) { - this.homepage = homepage; - } - - public String getHomepage() { - return homepage; - } - - } - }