X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=17340b8dde6312ad9fbaf159bdd644fc4ae65fe0;hp=f6fc60acc6873e138c2514365aa86f70914ef4c4;hb=3a7092e48f27cba6286946442783f539ad73a911;hpb=d74201ece068d856f7b102cc997b729c9e810c9a

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index f6fc60a..17340b8 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -27,21 +27,9 @@ import java.util.logging.LogRecord;
 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.core.WebOfTrustUpdaterImpl;
-import net.pterodactylus.sone.database.Database;
-import net.pterodactylus.sone.database.PostBuilderFactory;
-import net.pterodactylus.sone.database.PostProvider;
-import net.pterodactylus.sone.database.PostReplyBuilderFactory;
-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;
 import net.pterodactylus.sone.freenet.wot.Context;
-import net.pterodactylus.sone.freenet.wot.IdentityManager;
-import net.pterodactylus.sone.freenet.wot.IdentityManagerImpl;
 import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
 import net.pterodactylus.sone.web.WebInterface;
 import net.pterodactylus.util.config.Configuration;
@@ -50,6 +38,9 @@ import net.pterodactylus.util.config.MapConfigurationBackend;
 import net.pterodactylus.util.version.Version;
 
 import com.google.common.base.Optional;
+import com.google.common.cache.CacheBuilder;
+import com.google.common.cache.CacheLoader;
+import com.google.common.cache.LoadingCache;
 import com.google.common.eventbus.EventBus;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
@@ -61,7 +52,7 @@ 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.client.async.PersistenceDisabledException;
 import freenet.l10n.BaseL10n.LANGUAGE;
 import freenet.l10n.PluginL10n;
 import freenet.node.Node;
@@ -86,22 +77,31 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 
 	static {
 		/* initialize logging. */
-		Logger soneLogger = getLogger("Sone");
+		Logger soneLogger = getLogger("net.pterodactylus.sone");
 		soneLogger.setUseParentHandlers(false);
 		soneLogger.addHandler(new Handler() {
+			private final LoadingCache<String, Class<?>> classCache = CacheBuilder.newBuilder()
+					.build(new CacheLoader<String, Class<?>>() {
+						@Override
+						public Class<?> load(String key) throws Exception {
+							return Class.forName(key);
+						}
+					});
+			
 			@Override
 			public void publish(LogRecord logRecord) {
 				int recordLevel = logRecord.getLevel().intValue();
+				Class<?> loggingClass = classCache.getUnchecked(logRecord.getLoggerName());
 				if (recordLevel < Level.FINE.intValue()) {
-					freenet.support.Logger.debug(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown());
+					freenet.support.Logger.debug(loggingClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.INFO.intValue()) {
-					freenet.support.Logger.minor(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown());
+					freenet.support.Logger.minor(loggingClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.WARNING.intValue()) {
-					freenet.support.Logger.normal(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown());
+					freenet.support.Logger.normal(loggingClass, logRecord.getMessage(), logRecord.getThrown());
 				} else if (recordLevel < Level.SEVERE.intValue()) {
-					freenet.support.Logger.warning(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown());
+					freenet.support.Logger.warning(loggingClass, logRecord.getMessage(), logRecord.getThrown());
 				} else {
-					freenet.support.Logger.error(logRecord.getLoggerName(), logRecord.getMessage(), logRecord.getThrown());
+					freenet.support.Logger.error(loggingClass, logRecord.getMessage(), logRecord.getThrown());
 				}
 			}
 
@@ -116,10 +116,15 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	}
 
 	/** The version. */
-	public static final Version VERSION = new Version(0, 8, 9);
+	public static final Version VERSION = new Version(0, 9, 2);
+
+	/** The current year at time of release. */
+	private static final int YEAR = 2015;
+	private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
+	private static final int LATEST_EDITION = 69;
 
 	/** The logger. */
-	private static final Logger logger = getLogger("Sone.Plugin");
+	private static final Logger logger = getLogger(SonePlugin.class.getName());
 
 	/** The plugin respirator. */
 	private PluginRespirator pluginRespirator;
@@ -170,6 +175,14 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		return l10n;
 	}
 
+	public static int getYear() {
+		return YEAR;
+	}
+
+	public static String getHomepage() {
+		return SONE_HOMEPAGE + LATEST_EDITION;
+	}
+
 	//
 	// FREDPLUGIN METHODS
 	//
@@ -201,7 +214,7 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 			try {
 				oldConfiguration = new Configuration(new PluginStoreConfigurationBackend(pluginRespirator));
 				logger.log(Level.INFO, "Plugin store loaded.");
-			} catch (DatabaseDisabledException dde1) {
+			} catch (PersistenceDisabledException pde1) {
 				logger.log(Level.SEVERE, "Could not load any configuration, using empty configuration!");
 				oldConfiguration = new Configuration(new MapConfigurationBackend());
 			}