X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fxdcc%2Fcore%2FCore.java;h=eb0036c92d9c904fe45ea5aaf3300617b42b7faf;hb=bf5c410d06c7a354017ebcd321e365b9cd767081;hp=d875a5b21d2f0cb5ef38db28b10a37a203b7fea3;hpb=2789ac815443aff72512e4770aebb53cea9006a6;p=xudocci.git

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index d875a5b..eb0036c 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -33,8 +33,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import net.pterodactylus.irc.Connection;
 import net.pterodactylus.irc.ConnectionBuilder;
@@ -88,6 +86,7 @@ import com.google.common.eventbus.Subscribe;
 import com.google.common.io.Closeables;
 import com.google.common.util.concurrent.AbstractExecutionThreadService;
 import com.google.inject.Inject;
+import org.apache.log4j.Logger;
 
 /**
  * The core of XDCC Downloader.
@@ -281,7 +280,7 @@ public class Core extends AbstractExecutionThreadService {
 		try {
 			connection.sendMessage(bot.name(), "XDCC SEND " + pack.id());
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, "Could not send message to bot!", ioe1);
+			logger.warn("Could not send message to bot!", ioe1);
 		}
 	}
 
@@ -318,7 +317,7 @@ public class Core extends AbstractExecutionThreadService {
 		try {
 			connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
 		} catch (IOException ioe1) {
-			logger.log(Level.WARNING, String.format("Could not cancel DCC from %s (%s)!", bot.name(), bot.network().name()), ioe1);
+			logger.warn(String.format("Could not cancel DCC from %s (%s)!", bot.name(), bot.network().name()), ioe1);
 		}
 	}
 
@@ -481,7 +480,7 @@ public class Core extends AbstractExecutionThreadService {
 					eventBus.post(new GenericMessage(String.format("Trying to join %s on %s...", channel.name(), network.get().name())));
 					connectionEstablished.connection().joinChannel(channel.name());
 				} catch (IOException ioe1) {
-					logger.log(Level.WARNING, String.format("Could not join %s on %s!", channel.name(), network.get().name()), ioe1);
+					logger.warn(String.format("Could not join %s on %s!", channel.name(), network.get().name()), ioe1);
 				}
 			}
 		}
@@ -654,7 +653,7 @@ public class Core extends AbstractExecutionThreadService {
 
 		/* add pack. */
 		bot.addPack(pack.get());
-		logger.fine(String.format("Bot %s now has %d packs.", bot, bot.packs().size()));
+		logger.debug(String.format("Bot %s now has %d packs.", bot, bot.packs().size()));
 	}
 
 	/**
@@ -809,7 +808,7 @@ public class Core extends AbstractExecutionThreadService {
 			File outputFile = new File(temporaryDirectory, dccAcceptReceived.filename());
 			if (outputFile.length() != dccAcceptReceived.position()) {
 				eventBus.post(new GenericError(String.format("Download %s from %s does not start at the right position!")));
-				logger.log(Level.WARNING, String.format("Download %s from %s: have %d bytes but wants to resume from %d!", dccAcceptReceived.filename(), dccAcceptReceived.source(), outputFile.length(), dccAcceptReceived.position()));
+				logger.warn(String.format("Download %s from %s: have %d bytes but wants to resume from %d!", dccAcceptReceived.filename(), dccAcceptReceived.source(), outputFile.length(), dccAcceptReceived.position()));
 
 				downloads.removeAll(download.pack().name());
 				return;
@@ -838,7 +837,7 @@ public class Core extends AbstractExecutionThreadService {
 		Collection<Download> requestedDownload = FluentIterable.from(downloads.get(dccDownloadFinished.dccReceiver().filename())).filter(FILTER_RUNNING).toSet();
 		if (requestedDownload.isEmpty()) {
 			/* this seems wrong. */
-			logger.warning("Download finished but could not be located.");
+			logger.warn("Download finished but could not be located.");
 			return;
 		}
 		Download download = requestedDownload.iterator().next();
@@ -852,7 +851,7 @@ public class Core extends AbstractExecutionThreadService {
 			downloads.removeAll(download.pack().name());
 		} catch (IOException ioe1) {
 			/* TODO - handle all the errors. */
-			logger.log(Level.WARNING, String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
+			logger.warn(String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
 		}
 	}
 
@@ -869,7 +868,7 @@ public class Core extends AbstractExecutionThreadService {
 		Collection<Download> requestedDownload = FluentIterable.from(downloads.get(dccDownloadFailed.dccReceiver().filename())).filter(FILTER_RUNNING).toSet();
 		if (requestedDownload.isEmpty()) {
 			/* this seems wrong. */
-			logger.warning("Download finished but could not be located.");
+			logger.warn("Download finished but could not be located.");
 			return;
 		}
 		Download download = requestedDownload.iterator().next();
@@ -886,7 +885,7 @@ public class Core extends AbstractExecutionThreadService {
 
 	@Subscribe
 	public void replyReceived(ReplyReceived replyReceived) {
-		logger.log(Level.FINEST, String.format("%s: %s", replyReceived.connection().hostname(), replyReceived.reply()));
+		logger.trace(String.format("%s: %s", replyReceived.connection().hostname(), replyReceived.reply()));
 	}
 
 	//