X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloaderImpl.java;h=d3f23ed8f155714267e3b769b5792ea91019b229;hp=ff0eaf757c238622465d9a5418cc8869a2490ab0;hb=534abb5d5dba7f0377856d2d067ae48538226680;hpb=b2d6a2b045f1c41927880fdb79f466ae3c918aaf diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java index ff0eaf7..d3f23ed 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloaderImpl.java @@ -1,5 +1,5 @@ /* - * Sone - SoneDownloader.java - Copyright © 2010–2013 David Roden + * Sone - SoneDownloaderImpl.java - Copyright © 2010–2016 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 @@ -29,6 +29,8 @@ import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; +import javax.inject.Inject; + import net.pterodactylus.sone.core.FreenetInterface.Fetched; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.data.Sone.SoneStatus; @@ -41,8 +43,6 @@ import freenet.keys.FreenetURI; import freenet.keys.USK; import freenet.node.RequestStarter; import freenet.support.api.Bucket; -import freenet.support.io.Closer; -import com.db4o.ObjectContainer; import com.google.common.annotations.VisibleForTesting; @@ -54,7 +54,7 @@ import com.google.common.annotations.VisibleForTesting; public class SoneDownloaderImpl extends AbstractService implements SoneDownloader { /** The logger. */ - private static final Logger logger = getLogger("Sone.Downloader"); + private static final Logger logger = getLogger(SoneDownloaderImpl.class.getName()); /** The maximum protocol version. */ private static final int MAX_PROTOCOL_VERSION = 0; @@ -77,6 +77,7 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade * @param freenetInterface * The Freenet interface */ + @Inject public SoneDownloaderImpl(Core core, FreenetInterface freenetInterface) { this(core, freenetInterface, new SoneParser(core)); } @@ -118,7 +119,6 @@ public class SoneDownloaderImpl extends AbstractService implements SoneDownloade @Override @SuppressWarnings("synthetic-access") public void onFoundEdition(long edition, USK key, - ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) {