🔥 Remove unnecessary function

[xudocci.git] / src / main / java / net / pterodactylus / xdcc / core / Core.java

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 5b1b12d..8bc923f 100644 (file)
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -22,7 +22,6 @@ import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.banned;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.inviteOnly;
 import static net.pterodactylus.irc.event.ChannelNotJoined.Reason.registeredNicknamesOnly;
 import static net.pterodactylus.irc.util.MessageCleaner.getDefaultInstance;
-import static net.pterodactylus.xdcc.data.Channel.TO_NETWORK;
 import static net.pterodactylus.xdcc.data.Download.FILTER_RUNNING;
 
 import java.io.File;
@@ -186,7 +185,7 @@ public class Core extends AbstractExecutionThreadService {
         * @return All defined networks
         */
        public Collection<Network> networks() {
-               return FluentIterable.from(channels).transform(TO_NETWORK).toSet();
+               return FluentIterable.from(channels).transform(Channel::network).toSet();
        }
 
        /**
@@ -339,13 +338,6 @@ public class Core extends AbstractExecutionThreadService {
                        return;
                }
 
-               /* get connection. */
-               Connection connection = networkConnections.get(bot.network());
-               if (connection == null) {
-                       /* request for unknown network? */
-                       return;
-               }
-
                /* stop the DCC receiver. */
                if (download.get().dccReceiver() != null) {
                        download.get().dccReceiver().stop();
@@ -354,6 +346,13 @@ public class Core extends AbstractExecutionThreadService {
                        downloads.remove(pack.name(), download.get());
                }
 
+               /* get connection. */
+               Connection connection = networkConnections.get(bot.network());
+               if (connection == null) {
+                       /* request for unknown network? */
+                       return;
+               }
+
                /* remove the request from the bot, too. */
                try {
                        connection.sendMessage(bot.name(), String.format("XDCC %s", (download.get().dccReceiver() != null) ? "CANCEL" : "REMOVE"));
@@ -508,10 +507,13 @@ public class Core extends AbstractExecutionThreadService {
         *              The connection to remove
         */
        private void removeConnection(Connection connection) {
+               logger.debug(String.format("Removing Connection %s...", connection));
                Optional<Network> network = getNetwork(connection);
                if (!network.isPresent()) {
+                       logger.debug(String.format("Connection %s did not belong to any network.", connection));
                        return;
                }
+               logger.debug(String.format("Connection %s belongs to network %s.", connection, network.get()));
                networkConnections.remove(network.get());
 
                /* find all channels that need to be removed. */
@@ -521,7 +523,7 @@ public class Core extends AbstractExecutionThreadService {
                                if (!joinedChannel.network().equals(network.get())) {
                                        continue;
                                }
-
+                               logger.debug(String.format("Channel %s will be removed.", joinedChannel));
                                channelIterator.remove();
                        }
                }